into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_misc_functions.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_m.test:
Auto merged
mysql-test/t/rpl_loaddata_s.test:
Auto merged
mysql-test/t/rpl_misc_functions.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/r/mysqltest.result:
Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
"Use local" when merging 5.0 -> 5.1
d942f408bc