mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
1ead85e678
mysql-test/std_data/trunc_binlog.000001: Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001 client/mysqltest.c: Fixed merge problem mysql-test/mysql-test-run.sh: Fixed merge problem mysql-test/r/distinct.result: Fix after merge mysql-test/r/drop_temp_table.result: Fix after merge mysql-test/r/join_outer.result: Fix after merge mysql-test/r/mysqldump.result: Fix after merge mysql-test/r/null_key.result: Fix after merge mysql-test/r/order_by.result: Fix after merge mysql-test/r/rpl_alter.result: Fix after merge mysql-test/r/rpl_loaddata.result: Fix after merge mysql-test/r/rpl_loaddata_rule_m.result: Fix after merge mysql-test/r/rpl_trunc_binlog.result: Fix after merge mysql-test/r/select_safe.result: Fix after merge mysql-test/t/insert.test: Fix after merge mysql-test/t/mysqlbinlog.test: Fix after merge mysql-test/t/rpl000009.test: Fix after merge mysql-test/t/rpl_alter.test: Fix after merge mysql-test/t/rpl_loaddata_rule_m.test: Fix after merge mysql-test/t/rpl_trunc_binlog.test: Fix after merge sql-common/client.c: Fix after merge sql/item_subselect.cc: Fix after merge sql/repl_failsafe.cc: Fix after merge sql/slave.cc: Fix after merge sql/sql_insert.cc: Fix after merge
22 lines
665 B
Text
22 lines
665 B
Text
# We are testing if a binlog which contains BEGIN but not COMMIT (the
|
|
# master did while writing the transaction to the binlog) triggers an
|
|
# error on slave. So we use such a truncated binlog and simulate that
|
|
# the master restarted after this.
|
|
|
|
source include/master-slave.inc;
|
|
|
|
connection slave;
|
|
stop slave;
|
|
connection master;
|
|
flush logs;
|
|
system mv -f var/log/master-bin.000001 var/log/master-bin.000002;
|
|
system cp std_data/trunc_binlog.000001 var/log/master-bin.000001;
|
|
connection slave;
|
|
reset slave;
|
|
start slave;
|
|
# can't sync_with_master so we must sleep
|
|
sleep 3;
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
show slave status;
|
|
connection master;
|
|
reset master;
|