2009-05-31 11:26:58 +08:00
|
|
|
source include/master-slave.inc;
|
|
|
|
source include/have_innodb.inc;
|
2009-05-31 13:44:41 +08:00
|
|
|
source include/have_binlog_format_statement.inc;
|
2009-05-31 11:26:58 +08:00
|
|
|
|
2009-11-03 19:02:56 +00:00
|
|
|
connection slave;
|
|
|
|
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
|
|
|
|
|
|
|
|
connection master;
|
|
|
|
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
|
|
|
|
|
Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.
Conflicts:
- mysql-test/r/mysqld--help-win.result
- sql/sys_vars.cc
Original revsion (in next-mr-bugfixing):
------------------------------------------------------------
revno: 2971 [merge]
revision-id: alfranio.correia@sun.com-20100121210527-rbuheu5rnsmcakh1
committer: Alfranio Correia <alfranio.correia@sun.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Thu 2010-01-21 21:05:27 +0000
message:
BUG#46364 MyISAM transbuffer problems (NTM problem)
It is well-known that due to concurrency issues, a slave can become
inconsistent when a transaction contains updates to both transaction and
non-transactional tables.
In a nutshell, the current code-base tries to preserve causality among the
statements by writing non-transactional statements to the txn-cache which
is flushed upon commit. However, modifications done to non-transactional
tables on behalf of a transaction become immediately visible to other
connections but may not immediately get into the binary log and therefore
consistency may be broken.
In general, it is impossible to automatically detect causality/dependency
among statements by just analyzing the statements sent to the server. This
happen because dependency may be hidden in the application code and it is
necessary to know a priori all the statements processed in the context of
a transaction such as in a procedure. Moreover, even for the few cases that
we could automatically address in the server, the computation effort
required could make the approach infeasible.
So, in this patch we introduce the option
- "--binlog-direct-non-transactional-updates" that can be used to bypass
the current behavior in order to write directly to binary log statements
that change non-transactional tables.
Besides, it is used to enable the WL#2687 which is disabled by default.
------------------------------------------------------------
revno: 2970.1.1
revision-id: alfranio.correia@sun.com-20100121131034-183r4qdyld7an5a0
parent: alik@sun.com-20100121083914-r9rz2myto3tkdya0
committer: Alfranio Correia <alfranio.correia@sun.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Thu 2010-01-21 13:10:34 +0000
message:
BUG#46364 MyISAM transbuffer problems (NTM problem)
It is well-known that due to concurrency issues, a slave can become
inconsistent when a transaction contains updates to both transaction and
non-transactional tables.
In a nutshell, the current code-base tries to preserve causality among the
statements by writing non-transactional statements to the txn-cache which
is flushed upon commit. However, modifications done to non-transactional
tables on behalf of a transaction become immediately visible to other
connections but may not immediately get into the binary log and therefore
consistency may be broken.
In general, it is impossible to automatically detect causality/dependency
among statements by just analyzing the statements sent to the server. This
happen because dependency may be hidden in the application code and it is
necessary to know a priori all the statements processed in the context of
a transaction such as in a procedure. Moreover, even for the few cases that
we could automatically address in the server, the computation effort
required could make the approach infeasible.
So, in this patch we introduce the option
- "--binlog-direct-non-transactional-updates" that can be used to bypass
the current behavior in order to write directly to binary log statements
that change non-transactional tables.
Besides, it is used to enable the WL#2687 which is disabled by default.
2010-02-02 10:56:42 +03:00
|
|
|
SET @@session.binlog_direct_non_transactional_updates= FALSE;
|
|
|
|
|
2009-05-31 11:26:58 +08:00
|
|
|
disable_warnings;
|
|
|
|
DROP DATABASE IF EXISTS db1;
|
|
|
|
enable_warnings;
|
|
|
|
|
|
|
|
CREATE DATABASE db1;
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
--echo #
|
|
|
|
--echo # Clean up
|
|
|
|
--echo #
|
|
|
|
connection master;
|
|
|
|
DROP DATABASE db1;
|
|
|
|
connection slave;
|
|
|
|
DROP DATABASE db1;
|