mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
f56d77dadf
The bug allow multiple executing transactions working with non-transactional to interfere with each others by interleaving the events of different trans- actions. Bug is fixed by writing non-transactional events to the transaction cache and flushing the cache to the binary log at statement commit. To mimic the behavior of normal statement-based replication, we flush the transaction cache in row- based mode when there is no committed statements in the transaction cache, which means we are committing the first one. This means that it will be written to the binary log as a "mini-transaction" with just the rows for the statement. Note that the changes here does not take effect when building the server with HAVE_TRANSACTIONS set to false, but it is not clear if this was possible before this patch either. For row-based logging, we also have that when AUTOCOMMIT=1, the code now always generates a BEGIN/COMMIT pair for single statements, or BEGIN/ROLLBACK pair in the case of non-transactional changes in a statement that was rolled back. Note that for the case where changes to a non-transactional table causes a rollback due to error, the statement will now be logged with a BEGIN/ROLLBACK pair, even though some changes has been committed to the non-transactional table. mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test: Removing SHOW BINLOG EVENTS causing test to be non-deterministic. mysql-test/r/ctype_cp932_binlog_row.result: Result change. mysql-test/suite/binlog/r/binlog_base64_flag.result: Result change. mysql-test/suite/binlog/r/binlog_multi_engine.result: Result file change. mysql-test/suite/binlog/r/binlog_row_binlog.result: Result file change. mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result: Result file change. mysql-test/suite/binlog/r/binlog_row_insert_select.result: Result file change. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Result file change. mysql-test/suite/binlog/r/binlog_stm_binlog.result: Result file change. mysql-test/suite/binlog/t/binlog_base64_flag.test: Removing table that will be used in test to prevent failing if preceeding tests forgot to drop the table. mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result: Result file change. mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result: Result file change. mysql-test/suite/rpl/r/rpl_row_create_table.result: Result file change. mysql-test/suite/rpl/r/rpl_row_delayed_ins.result: Result file change. mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: Result file change. mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result: Result file change. mysql-test/suite/rpl/r/rpl_row_log.result: Result file change. mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Result file change. mysql-test/suite/rpl/r/rpl_row_until.result: Result file change. mysql-test/suite/rpl/r/rpl_slave_skip.result: Result file change. mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Result file change. mysql-test/suite/rpl/r/rpl_truncate_2myisam.result: Result file change. mysql-test/suite/rpl/t/rpl_row_create_table.test: Binlog position change. mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: Binlog position change. mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Binlog position change. Added stop position to mysqlbinlog argments to prevent extreneous output. mysql-test/suite/rpl/t/rpl_row_until.test: Binlog position change. mysql-test/suite/rpl/t/rpl_slave_skip.test: Binlog position change. mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Removing extreneous SHOW BINLOG EVENTS causing test to be non-deterministic. mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Result change. sql/log.cc: Adding variable at_least_one_stmt to denote that there is at least one statement committed to the transaction cache (but there might be more). Removing duplicate checks from binlog_end_trans(). The transaction cache should always be committed or rolled back when this function is called. Correcting conditions for binlog_rollback() and binlog_commit() and removing the previous "invisible commit" in favor of always using explicit commits in the binary log. sql/log_event.cc: Marking table map event to be cached. Removing Muted_query_log_event from code. sql/log_event.h: Removing unused class Muted_query_log_event. sql/sql_insert.cc: Adding missing call to ha_autocommit_or_rollback() for delayed thread. Marking CREATE-SELECT statements as transactional, since they don't need to be logged.
358 lines
8.2 KiB
Text
358 lines
8.2 KiB
Text
stop slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
reset master;
|
|
reset slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
start slave;
|
|
**** On Slave ****
|
|
STOP SLAVE;
|
|
**** On Master ****
|
|
SET SESSION BINLOG_FORMAT=ROW;
|
|
CREATE TABLE t1 (a INT, b INT);
|
|
CREATE TABLE t2 (c INT, d INT);
|
|
INSERT INTO t1 VALUES (1,1),(2,4),(3,9);
|
|
INSERT INTO t2 VALUES (1,1),(2,8),(3,27);
|
|
UPDATE t1,t2 SET b = d, d = b * 2 WHERE a = c;
|
|
show binlog events from <binlog_start>;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT, b INT)
|
|
master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (c INT, d INT)
|
|
master-bin.000001 # Query # # use `test`; BEGIN
|
|
master-bin.000001 # Table_map # # table_id: # (test.t1)
|
|
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
|
master-bin.000001 # Query # # use `test`; COMMIT
|
|
master-bin.000001 # Query # # use `test`; BEGIN
|
|
master-bin.000001 # Table_map # # table_id: # (test.t2)
|
|
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
|
master-bin.000001 # Query # # use `test`; COMMIT
|
|
master-bin.000001 # Query # # use `test`; BEGIN
|
|
master-bin.000001 # Table_map # # table_id: # (test.t1)
|
|
master-bin.000001 # Table_map # # table_id: # (test.t2)
|
|
master-bin.000001 # Update_rows # # table_id: #
|
|
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
|
|
master-bin.000001 # Query # # use `test`; COMMIT
|
|
SELECT * FROM t1;
|
|
a b
|
|
1 1
|
|
2 8
|
|
3 27
|
|
SELECT * FROM t2;
|
|
c d
|
|
1 2
|
|
2 16
|
|
3 54
|
|
**** On Slave ****
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762;
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port MASTER_PORT
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos 1133
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running No
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 0
|
|
Last_Error
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos 762
|
|
Relay_Log_Space #
|
|
Until_Condition Master
|
|
Until_Log_File master-bin.000001
|
|
Until_Log_Pos 762
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno #
|
|
Last_IO_Error #
|
|
Last_SQL_Errno 0
|
|
Last_SQL_Error
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
|
|
START SLAVE;
|
|
SELECT * FROM t1;
|
|
a b
|
|
1 1
|
|
2 4
|
|
3 9
|
|
SELECT * FROM t2;
|
|
c d
|
|
1 1
|
|
2 8
|
|
3 27
|
|
STOP SLAVE;
|
|
RESET SLAVE;
|
|
RESET MASTER;
|
|
SET SESSION BINLOG_FORMAT=STATEMENT;
|
|
SET @foo = 12;
|
|
INSERT INTO t1 VALUES(@foo, 2*@foo);
|
|
show binlog events from <binlog_start>;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # User var # # @`foo`=12
|
|
master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(@foo, 2*@foo)
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=106;
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
|
|
START SLAVE;
|
|
SHOW SLAVE STATUS;
|
|
Slave_IO_State #
|
|
Master_Host 127.0.0.1
|
|
Master_User root
|
|
Master_Port MASTER_PORT
|
|
Connect_Retry 1
|
|
Master_Log_File master-bin.000001
|
|
Read_Master_Log_Pos 248
|
|
Relay_Log_File #
|
|
Relay_Log_Pos #
|
|
Relay_Master_Log_File master-bin.000001
|
|
Slave_IO_Running Yes
|
|
Slave_SQL_Running Yes
|
|
Replicate_Do_DB
|
|
Replicate_Ignore_DB
|
|
Replicate_Do_Table
|
|
Replicate_Ignore_Table
|
|
Replicate_Wild_Do_Table
|
|
Replicate_Wild_Ignore_Table
|
|
Last_Errno 0
|
|
Last_Error
|
|
Skip_Counter 0
|
|
Exec_Master_Log_Pos 248
|
|
Relay_Log_Space #
|
|
Until_Condition None
|
|
Until_Log_File
|
|
Until_Log_Pos 0
|
|
Master_SSL_Allowed No
|
|
Master_SSL_CA_File
|
|
Master_SSL_CA_Path
|
|
Master_SSL_Cert
|
|
Master_SSL_Cipher
|
|
Master_SSL_Key
|
|
Seconds_Behind_Master #
|
|
Master_SSL_Verify_Server_Cert No
|
|
Last_IO_Errno #
|
|
Last_IO_Error #
|
|
Last_SQL_Errno 0
|
|
Last_SQL_Error
|
|
**** On Master ****
|
|
DROP TABLE t1, t2;
|
|
SET SESSION BINLOG_FORMAT=ROW;
|
|
SET AUTOCOMMIT=0;
|
|
CREATE TABLE t1 (a INT, b VARCHAR(20)) ENGINE=myisam;
|
|
CREATE TABLE t2 (a INT, b VARCHAR(20)) ENGINE=myisam;
|
|
CREATE TABLE t3 (a INT, b VARCHAR(20)) ENGINE=myisam;
|
|
INSERT INTO t1 VALUES (1,'master/slave');
|
|
INSERT INTO t2 VALUES (1,'master/slave');
|
|
INSERT INTO t3 VALUES (1,'master/slave');
|
|
CREATE TRIGGER tr1 AFTER UPDATE on t1 FOR EACH ROW
|
|
BEGIN
|
|
INSERT INTO t2 VALUES (NEW.a,NEW.b);
|
|
DELETE FROM t2 WHERE a < NEW.a;
|
|
END|
|
|
CREATE TRIGGER tr2 AFTER INSERT on t2 FOR EACH ROW
|
|
BEGIN
|
|
UPDATE t3 SET a =2, b = 'master only';
|
|
END|
|
|
**** On Slave ****
|
|
STOP SLAVE;
|
|
**** On Master ****
|
|
UPDATE t1 SET a = 2, b = 'master only' WHERE a = 1;
|
|
DROP TRIGGER tr1;
|
|
DROP TRIGGER tr2;
|
|
INSERT INTO t1 VALUES (3,'master/slave');
|
|
INSERT INTO t2 VALUES (3,'master/slave');
|
|
INSERT INTO t3 VALUES (3,'master/slave');
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
SELECT * FROM t3 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
*** On Slave ***
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
|
|
START SLAVE;
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b
|
|
1 master/slave
|
|
3 master/slave
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a b
|
|
1 master/slave
|
|
3 master/slave
|
|
SELECT * FROM t3 ORDER BY a;
|
|
a b
|
|
1 master/slave
|
|
3 master/slave
|
|
DROP TABLE t1, t2, t3;
|
|
**** Case 2: Row binlog format and transactional tables ****
|
|
*** On Master ***
|
|
CREATE TABLE t4 (a INT, b VARCHAR(20)) ENGINE=innodb;
|
|
CREATE TABLE t5 (a INT, b VARCHAR(20)) ENGINE=innodb;
|
|
CREATE TABLE t6 (a INT, b VARCHAR(20)) ENGINE=innodb;
|
|
**** On Slave ****
|
|
STOP SLAVE;
|
|
*** On Master ***
|
|
BEGIN;
|
|
INSERT INTO t4 VALUES (2, 'master only');
|
|
INSERT INTO t5 VALUES (2, 'master only');
|
|
INSERT INTO t6 VALUES (2, 'master only');
|
|
COMMIT;
|
|
BEGIN;
|
|
INSERT INTO t4 VALUES (3, 'master/slave');
|
|
INSERT INTO t5 VALUES (3, 'master/slave');
|
|
INSERT INTO t6 VALUES (3, 'master/slave');
|
|
COMMIT;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
SELECT * FROM t5 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
SELECT * FROM t6 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
*** On Slave ***
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
|
|
START SLAVE;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
SELECT * FROM t5 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
SELECT * FROM t6 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
**** On Slave ****
|
|
STOP SLAVE;
|
|
*** On Master ***
|
|
BEGIN;
|
|
INSERT INTO t4 VALUES (6, 'master only');
|
|
INSERT INTO t5 VALUES (6, 'master only');
|
|
INSERT INTO t6 VALUES (6, 'master only');
|
|
COMMIT;
|
|
BEGIN;
|
|
INSERT INTO t4 VALUES (7, 'master only');
|
|
INSERT INTO t5 VALUES (7, 'master only');
|
|
INSERT INTO t6 VALUES (7, 'master only');
|
|
COMMIT;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
6 master only
|
|
7 master only
|
|
SELECT * FROM t5 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
6 master only
|
|
7 master only
|
|
SELECT * FROM t6 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
6 master only
|
|
7 master only
|
|
*** On Slave ***
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=10;
|
|
START SLAVE;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
SELECT * FROM t5 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
SELECT * FROM t6 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
STOP SLAVE;
|
|
SET AUTOCOMMIT=0;
|
|
INSERT INTO t4 VALUES (4, 'master only');
|
|
INSERT INTO t5 VALUES (4, 'master only');
|
|
INSERT INTO t6 VALUES (4, 'master only');
|
|
COMMIT;
|
|
INSERT INTO t4 VALUES (5, 'master/slave');
|
|
INSERT INTO t5 VALUES (5, 'master/slave');
|
|
INSERT INTO t6 VALUES (5, 'master/slave');
|
|
COMMIT;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
4 master only
|
|
5 master/slave
|
|
6 master only
|
|
7 master only
|
|
SELECT * FROM t5 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
4 master only
|
|
5 master/slave
|
|
6 master only
|
|
7 master only
|
|
SELECT * FROM t6 ORDER BY a;
|
|
a b
|
|
2 master only
|
|
3 master/slave
|
|
4 master only
|
|
5 master/slave
|
|
6 master only
|
|
7 master only
|
|
*** On Slave ***
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
|
|
START SLAVE;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
5 master/slave
|
|
SELECT * FROM t5 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
5 master/slave
|
|
SELECT * FROM t6 ORDER BY a;
|
|
a b
|
|
3 master/slave
|
|
5 master/slave
|
|
DROP TABLE t4, t5, t6;
|
|
**** Case 3: Statement logging format and LOAD DATA with non-transactional table ****
|
|
*** On Master ***
|
|
CREATE TABLE t10 (a INT, b VARCHAR(20)) ENGINE=myisam;
|
|
*** On Slave ***
|
|
STOP SLAVE;
|
|
*** On Master ***
|
|
SET SESSION BINLOG_FORMAT=STATEMENT;
|
|
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/rpl_bug28618.dat' INTO TABLE t10 FIELDS TERMINATED BY '|';
|
|
SELECT * FROM t10 ORDER BY a;
|
|
a b
|
|
1 master only
|
|
2 master only
|
|
3 master only
|
|
*** On Slave ***
|
|
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
|
|
START SLAVE;
|
|
SELECT * FROM t10 ORDER BY a;
|
|
a b
|
|
DROP TABLE t10;
|