into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_EE_err.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Auto merged
mysql-test/r/backup.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/query_cache.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_rewrt_db.result:
  Auto merged
mysql-test/r/rpl_stm_000001.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_000015-slave.sh:
  Auto merged
mysql-test/t/rpl_flushlog_loop-master.opt:
  Auto merged
mysql-test/t/rpl_flushlog_loop-master.sh:
  Auto merged
mysql-test/t/rpl_flushlog_loop-slave.opt:
  Auto merged
mysql-test/t/rpl_flushlog_loop-slave.sh:
  Auto merged
mysql-test/t/rpl_loaddata_s.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_rewrt_db.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1
mysql-test/r/binlog_stm_blackhole.result:
  Merge 5.0 -> 5.1
mysql-test/r/mysqltest.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_loaddata_m.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_stm_log.result:
  Merge 5.0 -> 5.1
mysql-test/r/rpl_timezone.result:
  Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog.test:
  Merge 5.0 -> 5.1
mysql-test/t/mysqlbinlog2.test:
  Merge 5.0 -> 5.1
mysql-test/t/mysqltest.test:
  Merge 5.0 -> 5.1
mysql-test/t/rpl_drop_db.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_timezone.test:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-compat.test:
  Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
  Merge 5.0 -> 5.1