mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
a69a96e26a
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51 client/mysqltest.c: Auto merged include/my_pthread.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/sp.test: Auto merged mysys/my_wincond.c: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.cc: Auto merged client/mysql_upgrade.c: Manual merge; I chose to keep Magnus' changes because they make the code more simple; always use *only* the option file created by mysql_upgrade. mysql-test/extra/binlog_tests/ctype_cp932.test: Manual merge mysql-test/r/binlog_row_ctype_cp932.result: Manual merge mysql-test/r/binlog_stm_ctype_cp932.result: Manual merge mysql-test/r/mysqlbinlog.result: Manual merge mysql-test/r/rpl_switch_stm_row_mixed.result: Manual merge mysql-test/t/mysqlbinlog.test: Manual merge mysql-test/t/rpl_switch_stm_row_mixed.test: Manual merge |
||
---|---|---|
.. | ||
rpl_auto_increment.test | ||
rpl_commit_after_flush.test | ||
rpl_ddl.test | ||
rpl_deadlock.test | ||
rpl_delete_no_where.test | ||
rpl_EE_err.test | ||
rpl_extraSlave_Col.test | ||
rpl_failed_optimize.test | ||
rpl_flsh_tbls.test | ||
rpl_foreign_key.test | ||
rpl_insert_delayed.test | ||
rpl_insert_id.test | ||
rpl_insert_id_pk.test | ||
rpl_insert_ignore.test | ||
rpl_loaddata.test | ||
rpl_log.test | ||
rpl_max_relay_size.test | ||
rpl_multi_query.test | ||
rpl_multi_update.test | ||
rpl_multi_update2.test | ||
rpl_multi_update3.test | ||
rpl_ndb_2multi_eng.test | ||
rpl_ndb_ddl.test | ||
rpl_partition.test | ||
rpl_relayrotate.test | ||
rpl_reset_slave.test | ||
rpl_row_001.test | ||
rpl_row_basic.test | ||
rpl_row_blob.test | ||
rpl_row_charset.test | ||
rpl_row_delayed_ins.test | ||
rpl_row_func003.test | ||
rpl_row_sp002.test | ||
rpl_row_sp003.test | ||
rpl_row_sp006.test | ||
rpl_row_sp007.test | ||
rpl_row_tabledefs.test | ||
rpl_row_UUID.test | ||
rpl_stm_000001.test | ||
rpl_stm_charset.test | ||
rpl_stm_EE_err2.test | ||
rpl_sv_relay_space.test | ||
rpl_trig004.test | ||
rpl_truncate.test | ||
rpl_truncate_helper.test |