-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/r/rpl_000015.result: Auto merged mysql-test/r/rpl_change_master.result: Auto merged mysql-test/r/rpl_loaddata.result: Auto merged mysql-test/extra/rpl_tests/rpl_log.test: Auto merged mysql-test/extra/rpl_tests/rpl_max_relay_size.test: Auto merged mysql-test/r/rpl_err_ignoredtable.result: Auto merged mysql-test/r/rpl_replicate_do.result: Auto merged mysql-test/r/rpl_stm_log.result: Auto merged mysql-test/r/rpl_stm_max_relay_size.result: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/rpl_000015.test: Auto merged mysql-test/t/rpl_change_master.test: Auto merged mysql-test/t/rpl_drop_db.test: Auto merged mysql-test/t/rpl_err_ignoredtable.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_replicate_do.test: Auto merged mysql-test/t/rpl_stm_log-master.opt: Auto merged sql/sql_class.cc: Auto merged mysql-test/r/mysqldump.result: SCCS merged
c4eaeb83