mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
6ed9fc6b7a
skipped): By moving statement end actions from Rows_log_event::do_apply_event() to Rows_log_event::do_update_pos() they will always be executed, even if Rows_log_event::do_apply_event() is skipped because the event originated at the same server. This because Rows_log_event::do_update_pos() is always executed (unless Rows_log_event::do_apply_event() failed with an error, in which case the slave stops with an error anyway). Adding test case. Fixing logic to detect if inside a group. If a rotate event occured when an initial prefix of events for a statement, but for which the table did contain a key, last_event_start_time is set to zero, causing rotate to end the group but without unlocking any tables. This left a lock hanging around, which subsequently triggered an assertion when a second attempt was made to lock the same sequence of tables. In order to solve the above problem, a new flag was added to the relay log info structure that is used to indicate that the replication thread is currently executing a statement. Using this flag, the replication thread is in a group if it is either in a statement or inside a trans- action. The patch also eliminates some gratuitous header file inclusions that were not needed (and caused compile errors) and replaced them with forward definitions. sql/item_func.cc: Including definition of MASTER_INFO. sql/log.cc: Including definition of RELAY_LOG_INFO since it is used in the file. sql/log_event.cc: Moving statement end actions from Rows_log_event::do_apply_event() to Rows_log_event::do_update_pos(). Factoring out code to update group positions and event positions into relay log info structure. --- Adding debugging printouts. Fixing logic to detect if inside a group. sql/log_event.h: Adding Rows_log_event::do_update_pos(). sql/mysqld.cc: Including definition of MASTER_INFO. sql/repl_failsafe.cc: Including definition of MASTER_INFO. sql/rpl_mi.h: Including definition of RELAY_LOG_INFO since it is used in the file. sql/rpl_rli.cc: Adding member function stmt_done() to do after-statement updates of the relay log info structure. sql/rpl_rli.h: Adding member function stmt_done() to do after-statement updates of the relay log info structure. sql/set_var.cc: Including definition of MASTER_INFO. sql/slave.cc: Adding debuging printouts. sql/slave.h: Removing inclusion definitions of MASTER_INFO and RELAY_LOG_INFO and replacing them with forward declarations since the classes are not used in the file. The gratuitous inclusion lead to compile errors in the two classes above in files that used neither. sql/sql_binlog.cc: Including definition of RELAY_LOG_INFO since it is used in the file. sql/sql_class.cc: Including definition of RELAY_LOG_INFO since it is used in the file. sql/sql_class.h: Removing inclusion definitions of RELAY_LOG_INFO and replacing it with forward declaration since the class is not used in the file. The gratuitous inclusion lead to compile errors in the class above in files didn't use the class. sql/sql_insert.cc: Including definition of MASTER_INFO. sql/sql_repl.cc: Including definition of MASTER_INFO. mysql-test/r/rpl_ndb_circular_simplex.result: New BitKeeper file ``mysql-test/r/rpl_ndb_circular_simplex.result'' mysql-test/t/rpl_ndb_circular_simplex.test: New BitKeeper file ``mysql-test/t/rpl_ndb_circular_simplex.test''
77 lines
2 KiB
Text
77 lines
2 KiB
Text
--source include/have_ndb.inc
|
|
--source include/have_binlog_format_row.inc
|
|
--source include/master-slave.inc
|
|
|
|
connection master;
|
|
CREATE TABLE t1 (a int key, b int) ENGINE=NDB;
|
|
sync_slave_with_master;
|
|
SHOW TABLES;
|
|
|
|
# Lose the events from the slave binary log: there is no
|
|
# need to re-create the table on the master.
|
|
connection slave;
|
|
RESET MASTER;
|
|
|
|
# Insert some values on the slave and master
|
|
connection master;
|
|
INSERT INTO t1 VALUES (1,2);
|
|
# Switch to slave once event is applied and insert a row
|
|
sync_slave_with_master;
|
|
connection slave;
|
|
INSERT INTO t1 VALUES (2,3);
|
|
|
|
# ... it is now very probable that we have a mixed event in the binary
|
|
# log. If we don't, the test should still pass, but will not test the
|
|
# mixed event situation.
|
|
|
|
# The statement is disabled since it cannot reliably show the same
|
|
# info all the time. Use it for debug purposes.
|
|
|
|
#SHOW BINLOG EVENTS;
|
|
|
|
# Replicate back to the master to test this mixed event on the master
|
|
STOP SLAVE;
|
|
|
|
connection master;
|
|
--replace_result $SLAVE_MYPORT SLAVE_PORT
|
|
eval CHANGE MASTER TO MASTER_HOST="127.0.0.1",MASTER_PORT=$SLAVE_MYPORT,MASTER_USER="root";
|
|
|
|
RESET MASTER;
|
|
START SLAVE;
|
|
|
|
connection slave;
|
|
save_master_pos;
|
|
connection master;
|
|
sync_with_master;
|
|
|
|
# The statement is disabled since it cannot reliably show the same
|
|
# info all the time. Use it for debug purposes.
|
|
|
|
#SHOW BINLOG EVENTS;
|
|
|
|
# Check that there is no error in replication
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 8 # 9 # 23 # 33 #
|
|
query_vertical SHOW SLAVE STATUS;
|
|
|
|
# Check that we have the data on the master
|
|
SELECT * FROM t1 ORDER BY a;
|
|
|
|
# We should now have another mixed event, likely with "slave" server
|
|
# id last, and with the STMT_END_F flag set.
|
|
|
|
# The statement is disabled since it cannot reliably show the same
|
|
# info all the time. Use it for debug purposes.
|
|
|
|
#SHOW BINLOG EVENTS;
|
|
|
|
# now lets see that this data is applied correctly on the slave
|
|
STOP SLAVE;
|
|
save_master_pos;
|
|
|
|
connection slave;
|
|
START SLAVE;
|
|
|
|
# check that we have the data on the slave
|
|
sync_with_master;
|
|
SELECT * FROM t1 ORDER BY a;
|