mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
a63ef17fca
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl include/my_base.h: Auto merged mysql-test/include/show_binlog_events2.inc: Auto merged mysql-test/suite/binlog/t/binlog_old_versions.test: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt: Auto merged mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt: Auto merged sql/log_event_old.cc: Auto merged sql/sql_binlog.cc: Auto merged mysql-test/suite/rpl/r/rpl_loaddata_map.result: Manual merge. mysql-test/suite/rpl/r/rpl_user.result: Manual merge. mysql-test/suite/rpl/t/rpl_loaddata_map.test: Manual merge. mysql-test/suite/rpl/t/rpl_user.test: Manual merge. sql/log_event.cc: Manual merge. sql/rpl_record.cc: Manual merge. |
||
---|---|---|
.. | ||
binlog_base64_flag.test | ||
binlog_database.test | ||
binlog_innodb.test | ||
binlog_killed.test | ||
binlog_killed_simulate-master.opt | ||
binlog_killed_simulate.test | ||
binlog_multi_engine.test | ||
binlog_old_versions.test | ||
binlog_row_binlog-master.opt | ||
binlog_row_binlog.test | ||
binlog_row_ctype_cp932.test | ||
binlog_row_ctype_ucs.test | ||
binlog_row_drop_tmp_tbl.test | ||
binlog_row_innodb_stat-master.opt | ||
binlog_row_innodb_stat.test | ||
binlog_row_insert_select.test | ||
binlog_row_mix_innodb_myisam-master.opt | ||
binlog_row_mix_innodb_myisam.test | ||
binlog_start_comment.test | ||
binlog_statement_insert_delayed.test | ||
binlog_stm_binlog-master.opt | ||
binlog_stm_binlog.test | ||
binlog_stm_blackhole.test | ||
binlog_stm_ctype_cp932.test | ||
binlog_stm_ctype_ucs.test | ||
binlog_stm_drop_tmp_tbl.test | ||
binlog_stm_innodb_stat-master.opt | ||
binlog_stm_innodb_stat.test | ||
binlog_stm_insert_select.test | ||
binlog_stm_mix_innodb_myisam-master.opt | ||
binlog_stm_mix_innodb_myisam.test | ||
binlog_stm_ps.test | ||
binlog_unsafe.test | ||
disabled.def |