mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
88b3205653
After BUG#36649, warnings for sub-statements are cleared when a
new sub-statement is started. This is problematic since it suppresses
warnings for unsafe statements in some cases. It is important that we
always give a warning to the client, because the user needs to know
when there is a risk that the slave goes out of sync.
We fixed the problem by generating warning messages for unsafe statements
while returning from a stored procedure, function, trigger or while
executing a top level statement.
We also started checking unsafeness when both performance and log tables are
used. This is necessary after the performance schema which does a distinction
between performance and log tables.
mysql-test/extra/rpl_tests/create_recursive_construct.inc:
Changed the order of the calls in the procedure because the code
that checks if a warning message is printed out expects that the
first statement gives an warning what is not the case for INSERT
INTO ta$CRC_ARG_level VALUES (47);
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result:
Updated the result file.
mysql-test/suite/binlog/r/binlog_unsafe.result:
There are several changes here:
(1) - Changed the CREATE PROCEDURE $CRC.
(2) - The procedure $CRC was failing and the content of the binlog
was being printed out, after fix (1) the failure disappeared.
(3) - The warning message for unsafeness due to auto-increment collumns was
changed.
(4) - The warning message for unsafeness due to VERSION(), RAND() was changed.
mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test:
Tested filters.
mysql-test/suite/binlog/t/binlog_unsafe.test:
Reenabled the test case binlog_unsafe.
mysql-test/suite/binlog/t/disabled.def:
Reenabled the test case binlog_unsafe.
mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result:
Updated the result file.
mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result:
Updated the result file.
mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result:
Updated the result file.
sql/sql_class.cc:
Moved the stmt_accessed_table_flag variable and related information to the
LEX as we need the variable reset after each statement even inside a stored
procedure, what did not happen if the information was in the THD.
Changed the routine in the THD::binlog_query that prints the warning
messages to avoid trying to print them when inside a stored procedure,
function or trigger.
Checked for unsafeness when both performance and log tables where used.
After the introduction of the performance schema, we need to check both.
180 lines
5.3 KiB
Text
180 lines
5.3 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;
|
|
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
|
|
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
|
|
SET @@session.binlog_direct_non_transactional_updates= FALSE;
|
|
DROP DATABASE IF EXISTS db1;
|
|
DROP DATABASE IF EXISTS db2;
|
|
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;
|
|
include/stop_slave.inc
|
|
[on master]
|
|
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//
|
|
INSERT INTO db1.t2 VALUES ('before call db1.p1()');
|
|
use test;
|
|
BEGIN;
|
|
CALL db1.p1();
|
|
COMMIT;
|
|
INSERT INTO db1.t2 VALUES ('after call db1.p1()');
|
|
SELECT * FROM db1.t1;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
SELECT * FROM db1.t2;
|
|
s
|
|
before call db1.p1()
|
|
after call db1.p1()
|
|
[on slave]
|
|
start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_POS;
|
|
#
|
|
# If we got non-zero here, then we're suffering BUG#43263
|
|
#
|
|
SELECT 0 as 'Must be 0';
|
|
Must be 0
|
|
0
|
|
SELECT * from db1.t1;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
SELECT * from db1.t2;
|
|
s
|
|
before call db1.p1()
|
|
[on master]
|
|
INSERT INTO db1.t2 VALUES ('before call db1.p2()');
|
|
BEGIN;
|
|
CALL db1.p2();
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction.
|
|
ROLLBACK;
|
|
INSERT INTO db1.t2 VALUES ('after call db1.p2()');
|
|
SELECT * FROM db1.t1;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
SELECT * FROM db1.t2;
|
|
s
|
|
before call db1.p1()
|
|
after call db1.p1()
|
|
before call db1.p2()
|
|
executed db1.p2()
|
|
after call db1.p2()
|
|
[on slave]
|
|
start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_POS;
|
|
#
|
|
# If we got non-zero here, then we're suffering BUG#43263
|
|
#
|
|
SELECT 0 as 'Must be 0';
|
|
Must be 0
|
|
0
|
|
SELECT * from db1.t1;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
4
|
|
5
|
|
SELECT * from db1.t2;
|
|
s
|
|
before call db1.p1()
|
|
executed db1.p2()
|
|
START SLAVE;
|
|
#
|
|
# SAVEPOINT and ROLLBACK TO have the same problem in BUG#43263
|
|
# This was reported by BUG#50407
|
|
[on master]
|
|
SET SESSION AUTOCOMMIT=0
|
|
BEGIN;
|
|
INSERT INTO db1.t1 VALUES(20);
|
|
#
|
|
# 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");
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction.
|
|
USE db2;
|
|
SavePoint mixed_cases;
|
|
USE db1;
|
|
INSERT INTO db1.t2 VALUES("in savepoint mixed_cases");
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction.
|
|
INSERT INTO db1.t1 VALUES(40);
|
|
USE db2;
|
|
ROLLBACK TO mixed_cases;
|
|
Warnings:
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
ROLLBACK TO has_comment;
|
|
Warnings:
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
USE db1;
|
|
INSERT INTO db1.t2 VALUES("after rollback to");
|
|
Warnings:
|
|
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional table after accessing a transactional table within the same transaction.
|
|
INSERT INTO db1.t1 VALUES(50);
|
|
USE db2;
|
|
COMMIT;
|
|
show binlog events from <binlog_start>;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # Query # # BEGIN
|
|
master-bin.000001 # Query # # use `test`; INSERT INTO db1.t1 VALUES(20)
|
|
master-bin.000001 # Query # # SAVEPOINT has_comment
|
|
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(30)
|
|
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint has_comment")
|
|
master-bin.000001 # Query # # SAVEPOINT mixed_cases
|
|
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("in savepoint mixed_cases")
|
|
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(40)
|
|
master-bin.000001 # Query # # ROLLBACK TO mixed_cases
|
|
master-bin.000001 # Query # # ROLLBACK TO has_comment
|
|
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t2 VALUES("after rollback to")
|
|
master-bin.000001 # Query # # use `db1`; INSERT INTO db1.t1 VALUES(50)
|
|
master-bin.000001 # Xid # # COMMIT /* XID */
|
|
[on slave]
|
|
#
|
|
# Verify INSERT statements in savepoints are executed, for MyISAM table
|
|
# is not effected by ROLLBACK TO
|
|
SELECT * FROM db1.t2 WHERE s LIKE '% savepoint %';
|
|
s
|
|
in savepoint has_comment
|
|
in savepoint mixed_cases
|
|
#
|
|
# Verify INSERT statements on the Innodb table are rolled back;
|
|
SELECT * FROM db1.t1 WHERE a IN (30, 40);
|
|
a
|
|
#
|
|
# Clean up
|
|
#
|
|
DROP DATABASE db1;
|
|
DROP DATABASE db2;
|