• unknown's avatar
    Merge... · 6d4946fc
    unknown authored
    Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
    into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
    
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/extra/binlog_tests/ctype_cp932.test:
      Auto merged
    mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
      Auto merged
    mysql-test/extra/rpl_tests/rpl_stm_000001.test:
      Auto merged
    mysql-test/r/binlog_stm_ctype_cp932.result:
      Auto merged
    mysql-test/r/ps_1general.result:
      Auto merged
    mysql-test/r/query_cache.result:
      Auto merged
    mysql-test/r/rpl000017.result:
      Auto merged
    mysql-test/r/rpl_loaddata.result:
      Auto merged
    mysql-test/r/rpl_loaddata_s.result:
      Auto merged
    mysql-test/r/rpl_replicate_do.result:
      Auto merged
    mysql-test/r/rpl_stm_000001.result:
      Auto merged
    mysql-test/r/rpl_stm_flsh_tbls.result:
      Auto merged
    mysql-test/r/sp-prelocking.result:
      Auto merged
    mysql-test/r/type_bit.result:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/r/view_grant.result:
      Auto merged
    mysql-test/t/create_select_tmp.test:
      Auto merged
    mysql-test/t/ps_1general.test:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    mysql-test/t/rpl000017.test:
      Auto merged
    mysql-test/t/rpl_replicate_do.test:
      Auto merged
    mysql-test/t/sp-prelocking.test:
      Auto merged
    mysql-test/t/trigger-compat.test:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    mysql-test/t/view_grant.test:
      Auto merged
    mysql-test/r/rpl_loaddata_m.result:
      Merge 5.0->5.1
    mysql-test/t/rpl_failed_optimize.test:
      Merge 5.0->5.1
    mysql-test/t/rpl_insert_id.test:
      Merge 5.0->5.1
    mysql-test/t/rpl_loaddata.test:
      Merge 5.0->5.1
    mysql-test/t/rpl_loaddata_m.test:
      Merge 5.0->5.1
    mysql-test/t/rpl_loaddata_s.test:
      Merge 5.0->5.1
    mysql-test/t/rpl_multi_update3.test:
      Merge 5.0->5.1
    6d4946fc
view_grant.result 21.7 KB