mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
454c003a5c
When mysqlbinlog was given the --database=X flag, it always printed 'ROLLBACK TO', but the corresponding 'SAVEPOINT' statement was not printed. The replicated filter(replicated-do/ignore-db) and binlog filter (binlog-do/ignore-db) has the same problem. They are solved in this patch together. After this patch, We always check whether the query is 'SAVEPOINT' statement or not. Because this is a literal check, 'SAVEPOINT' and 'ROLLBACK TO' statements are also binlogged in uppercase with no any comments. The binlog before this patch can be handled correctly except one case that any comments are in front of the keywords. for example: /* bla bla */ SAVEPOINT a; /* bla bla */ ROLLBACK TO a;
172 lines
4.6 KiB
Text
172 lines
4.6 KiB
Text
source include/master-slave.inc;
|
|
source include/have_innodb.inc;
|
|
source include/have_binlog_format_statement.inc;
|
|
|
|
disable_warnings;
|
|
DROP DATABASE IF EXISTS db1;
|
|
DROP DATABASE IF EXISTS db2;
|
|
enable_warnings;
|
|
|
|
CREATE DATABASE db1;
|
|
CREATE DATABASE db2;
|
|
|
|
use db1;
|
|
|
|
CREATE TABLE db1.t1 (a INT) ENGINE=InnoDB;
|
|
CREATE TABLE db1.t2 (s CHAR(255)) ENGINE=MyISAM;
|
|
|
|
sync_slave_with_master;
|
|
source include/stop_slave.inc;
|
|
connection master;
|
|
echo [on master];
|
|
|
|
DELIMITER //;
|
|
CREATE PROCEDURE db1.p1 ()
|
|
BEGIN
|
|
INSERT INTO t1 VALUES (1);
|
|
INSERT INTO t1 VALUES (2);
|
|
INSERT INTO t1 VALUES (3);
|
|
INSERT INTO t1 VALUES (4);
|
|
INSERT INTO t1 VALUES (5);
|
|
END//
|
|
|
|
CREATE PROCEDURE db1.p2 ()
|
|
BEGIN
|
|
INSERT INTO t1 VALUES (6);
|
|
INSERT INTO t1 VALUES (7);
|
|
INSERT INTO t1 VALUES (8);
|
|
INSERT INTO t1 VALUES (9);
|
|
INSERT INTO t1 VALUES (10);
|
|
INSERT INTO t2 VALUES ('executed db1.p2()');
|
|
END//
|
|
DELIMITER ;//
|
|
|
|
INSERT INTO db1.t2 VALUES ('before call db1.p1()');
|
|
|
|
# Note: the master_log_pos is set to be the position of the BEGIN + 1,
|
|
# so before fix of BUG#43263 if the BEGIN is ignored, then all the
|
|
# INSERTS in p1 will be replicated in AUTOCOMMIT=1 mode and the slave
|
|
# SQL thread will stop right before the first INSERT. After fix of
|
|
# BUG#43263, BEGIN will not be ignored by the replication db rules,
|
|
# and then the whole transaction will be executed before slave SQL
|
|
# stop.
|
|
let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1);
|
|
let $master_pos= `SELECT $master_pos + 1`;
|
|
|
|
use test;
|
|
BEGIN;
|
|
CALL db1.p1();
|
|
COMMIT;
|
|
|
|
# The position where the following START SLAVE UNTIL will stop at
|
|
let $master_end_trans_pos= query_get_value(SHOW MASTER STATUS, Position, 1);
|
|
|
|
INSERT INTO db1.t2 VALUES ('after call db1.p1()');
|
|
SELECT * FROM db1.t1;
|
|
SELECT * FROM db1.t2;
|
|
|
|
connection slave;
|
|
echo [on slave];
|
|
|
|
replace_result $master_pos MASTER_POS;
|
|
eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_pos;
|
|
source include/wait_for_slave_sql_to_stop.inc;
|
|
let $slave_sql_stop_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1);
|
|
let $result= query_get_value(SELECT $slave_sql_stop_pos - $master_end_trans_pos as result, result, 1);
|
|
|
|
--echo #
|
|
--echo # If we got non-zero here, then we're suffering BUG#43263
|
|
--echo #
|
|
eval SELECT $result as 'Must be 0';
|
|
SELECT * from db1.t1;
|
|
SELECT * from db1.t2;
|
|
|
|
connection master;
|
|
echo [on master];
|
|
|
|
INSERT INTO db1.t2 VALUES ('before call db1.p2()');
|
|
|
|
# See comments above.
|
|
let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1);
|
|
let $master_pos= `SELECT $master_pos + 1`;
|
|
|
|
BEGIN;
|
|
CALL db1.p2();
|
|
disable_warnings;
|
|
ROLLBACK;
|
|
enable_warnings;
|
|
let $master_end_trans_pos= query_get_value(SHOW MASTER STATUS, Position, 1);
|
|
|
|
INSERT INTO db1.t2 VALUES ('after call db1.p2()');
|
|
SELECT * FROM db1.t1;
|
|
SELECT * FROM db1.t2;
|
|
|
|
connection slave;
|
|
echo [on slave];
|
|
|
|
replace_result $master_pos MASTER_POS;
|
|
eval start slave until master_log_file='master-bin.000001', master_log_pos=$master_pos;
|
|
source include/wait_for_slave_sql_to_stop.inc;
|
|
|
|
let $slave_sql_stop_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1);
|
|
let $result= query_get_value(SELECT $slave_sql_stop_pos - $master_end_trans_pos as result, result, 1);
|
|
|
|
--echo #
|
|
--echo # If we got non-zero here, then we're suffering BUG#43263
|
|
--echo #
|
|
eval SELECT $result as 'Must be 0';
|
|
SELECT * from db1.t1;
|
|
SELECT * from db1.t2;
|
|
|
|
START SLAVE;
|
|
source include/wait_for_slave_sql_to_start.inc;
|
|
|
|
--echo #
|
|
--echo # SAVEPOINT and ROLLBACK TO have the same problem in BUG#43263
|
|
--echo # This was reported by BUG#50407
|
|
connection master;
|
|
echo [on master]
|
|
SET SESSION AUTOCOMMIT=0;
|
|
let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1);
|
|
|
|
BEGIN;
|
|
INSERT INTO db1.t1 VALUES(20);
|
|
|
|
--echo #
|
|
--echo # Verify whether this statement is binlogged correctly
|
|
/*comment*/ SAVEPOINT has_comment;
|
|
USE db1;
|
|
INSERT INTO db1.t1 VALUES(30);
|
|
INSERT INTO db1.t2 VALUES("in savepoint has_comment");
|
|
USE db2;
|
|
SavePoint mixed_cases;
|
|
USE db1;
|
|
INSERT INTO db1.t2 VALUES("in savepoint mixed_cases");
|
|
INSERT INTO db1.t1 VALUES(40);
|
|
USE db2;
|
|
ROLLBACK TO mixed_cases;
|
|
ROLLBACK TO has_comment;
|
|
USE db1;
|
|
INSERT INTO db1.t2 VALUES("after rollback to");
|
|
INSERT INTO db1.t1 VALUES(50);
|
|
USE db2;
|
|
COMMIT;
|
|
source include/show_binlog_events.inc;
|
|
sync_slave_with_master;
|
|
|
|
--echo [on slave]
|
|
--echo #
|
|
--echo # Verify INSERT statements in savepoints are executed, for MyISAM table
|
|
--echo # is not effected by ROLLBACK TO
|
|
SELECT * FROM db1.t2 WHERE s LIKE '% savepoint %';
|
|
--echo #
|
|
--echo # Verify INSERT statements on the Innodb table are rolled back;
|
|
SELECT * FROM db1.t1 WHERE a IN (30, 40);
|
|
|
|
--echo #
|
|
--echo # Clean up
|
|
--echo #
|
|
connection master;
|
|
DROP DATABASE db1;
|
|
DROP DATABASE db2;
|
|
source include/master-slave-end.inc;
|