• unknown's avatar
    Merge... · 68575c0a
    unknown authored
    Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
    
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/ps_1general.result:
      Auto merged
    mysql-test/r/query_cache.result:
      Auto merged
    mysql-test/r/rpl_loaddata_m.result:
      Auto merged
    mysql-test/r/sp-security.result:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/r/view_grant.result:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    mysql-test/t/read_only.test:
      Auto merged
    mysql-test/t/sp-security.test:
      Auto merged
    mysql-test/t/trigger-compat.test:
      Auto merged
    mysql-test/t/view_grant.test:
      Auto merged
    mysql-test/r/trigger-compat.result:
      Merge 5.0 -> 5.1
    68575c0a
sp-security.result 10.6 KB