mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
1307d3b803
Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack Once had been set the flag might later got reset inside of a stored routine execution stack. The reason was in that there was no check if a new statement started at time of resetting. The artifact affects most of binlogable DML queries. Notice, that multi-update is wrapped up within bug@27716 fix, multi-delete bug@29136. Fixed with saving parent's statement flag of whether the statement modified non-transactional table, and unioning (merging) the value with that was gained in mysql_execute_command. Resettling thd->no_trans_update members into thd->transaction.`member`; Asserting code; Effectively the following properties are held. 1. At the end of a substatement thd->transaction.stmt.modified_non_trans_table reflects the fact if such a table got modified by the substatement. That also respects THD::really_abort_on_warnin() requirements. 2. Eventually thd->transaction.stmt.modified_non_trans_table will be computed as the union of the values of all invoked sub-statements. That fixes this bug#27417; Computing of thd->transaction.all.modified_non_trans_table is refined to base to the stmt's value for all the case including insert .. select statement which before the patch had an extra issue bug@28960. Minor issues are covered with mysql_load, mysql_delete, and binloggin of insert in to temp_table select. The supplied test verifies limitely, mostly asserts. The ultimate testing is defered for bug@13270, bug@23333. mysql-test/r/mix_innodb_myisam_binlog.result: results changed mysql-test/t/mix_innodb_myisam_binlog.test: regression test incl the related bug#28960. sql/ha_ndbcluster.cc: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/handler.cc: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/handler.h: new member added sql/log.cc: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/set_var.cc: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/sp_head.cc: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} and saving and merging stmt's flag at the end of a substatement. sql/sql_class.cc: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/sql_class.h: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/sql_delete.cc: correcting basic delete incl truncate branch and multi-delete queries to set stmt.modified_non_trans_table; optimization to set the flag at the end of per-row loop; multi-delete still has an extra issue similar to bug#27716 of multi-update - to be address with bug_29136 fix. sql/sql_insert.cc: thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/sql_load.cc: eliminating a separate issue where the stmt flag was saved and re-stored after write_record that actually could change it and the change would be lost but should remain permanent; thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt} sql/sql_parse.cc: initialization to transaction.stmt.modified_non_trans_table at the common part of all types of statements processing - mysql_execute_command(). sql/sql_table.cc: moving the reset up to the mysql_execute_command() caller sql/sql_update.cc: correcting update query case (multi-update part of the issues covered by other bug#27716 fix) thd->transaction.{all,stmt}.modified_non_trans_table instead of thd->no_trans_update.{all,stmt}
387 lines
9.1 KiB
Text
387 lines
9.1 KiB
Text
# Check that binlog is ok when a transaction mixes updates to InnoDB and
|
|
# MyISAM.
|
|
# It would be nice to make this a replication test, but in 4.0 the
|
|
# slave is always with --skip-innodb in the testsuite. I (Guilhem) however
|
|
# did some tests manually on a slave; tables are replicated fine and
|
|
# Exec_Master_Log_Pos advances as expected.
|
|
|
|
-- source include/have_log_bin.inc
|
|
-- source include/have_innodb.inc
|
|
|
|
--disable_warnings
|
|
drop table if exists t1, t2;
|
|
--enable_warnings
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
|
|
connection con1;
|
|
create table t1 (a int) engine=innodb;
|
|
create table t2 (a int) engine=myisam;
|
|
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(1);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(2);
|
|
insert into t2 select * from t1;
|
|
# should say some changes to non-transact1onal tables couldn't be rolled back
|
|
rollback;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(3);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(4);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
commit;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(5);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(6);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
insert into t1 values(7);
|
|
commit;
|
|
select a from t1 order by a; # check that savepoints work :)
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
# and when ROLLBACK is not explicit?
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
select get_lock("a",10);
|
|
begin;
|
|
insert into t1 values(8);
|
|
insert into t2 select * from t1;
|
|
disconnect con1;
|
|
|
|
connection con2;
|
|
# We want to SHOW BINLOG EVENTS, to know what was logged. But there is no
|
|
# guarantee that logging of the terminated con1 has been done yet (it may not
|
|
# even be started, so con1 may have not even attempted to lock the binlog yet;
|
|
# so SHOW BINLOG EVENTS may come before con1 does the loggin. To be sure that
|
|
# logging has been done, we use a user lock.
|
|
select get_lock("a",10);
|
|
source include/show_binlog_events.inc;
|
|
|
|
# and when not in a transact1on?
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
insert into t1 values(9);
|
|
insert into t2 select * from t1;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
# Check that when the query updat1ng the MyISAM table is the first in the
|
|
# transaction, we log it immediately.
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
insert into t1 values(10); # first make t1 non-empty
|
|
begin;
|
|
insert into t2 select * from t1;
|
|
source include/show_binlog_events.inc;
|
|
insert into t1 values(11);
|
|
commit;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
# Check that things work like before this BEGIN/ROLLBACK code was added,
|
|
# when t2 is INNODB
|
|
|
|
alter table t2 engine=INNODB;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(12);
|
|
insert into t2 select * from t1;
|
|
commit;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(13);
|
|
insert into t2 select * from t1;
|
|
rollback;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(14);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(15);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
commit;
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
reset master;
|
|
|
|
begin;
|
|
insert into t1 values(16);
|
|
savepoint my_savepoint;
|
|
insert into t1 values(17);
|
|
insert into t2 select * from t1;
|
|
rollback to savepoint my_savepoint;
|
|
insert into t1 values(18);
|
|
commit;
|
|
select a from t1 order by a; # check that savepoints work :)
|
|
|
|
source include/show_binlog_events.inc;
|
|
|
|
# Test for BUG#5714, where a MyISAM update in the transaction used to
|
|
# release row-level locks in InnoDB
|
|
|
|
connect (con3,localhost,root,,);
|
|
|
|
connection con3;
|
|
delete from t1;
|
|
delete from t2;
|
|
--disable_warnings
|
|
alter table t2 type=MyISAM;
|
|
--enable_warnings
|
|
insert into t1 values (1);
|
|
begin;
|
|
select * from t1 for update;
|
|
|
|
connection con2;
|
|
select (@before:=unix_timestamp())*0; # always give repeatable output
|
|
begin;
|
|
send select * from t1 for update;
|
|
|
|
connection con3;
|
|
insert into t2 values (20);
|
|
|
|
connection con2;
|
|
--error 1205
|
|
reap;
|
|
select (@after:=unix_timestamp())*0; # always give repeatable output
|
|
# verify that innodb_lock_wait_timeout was exceeded. When there was
|
|
# the bug, the reap would return immediately after the insert into t2.
|
|
select (@after-@before) >= 2;
|
|
|
|
drop table t1,t2;
|
|
commit;
|
|
|
|
# test for BUG#7947 - DO RELEASE_LOCK() not written to binlog on rollback in the middle
|
|
# of a transaction
|
|
|
|
connection con2;
|
|
begin;
|
|
create temporary table ti (a int) engine=innodb;
|
|
rollback;
|
|
insert into ti values(1);
|
|
set autocommit=0;
|
|
create temporary table t1 (a int) engine=myisam;
|
|
commit;
|
|
insert t1 values (1);
|
|
rollback;
|
|
create table t0 (n int);
|
|
insert t0 select * from t1;
|
|
set autocommit=1;
|
|
insert into t0 select GET_LOCK("lock1",null);
|
|
set autocommit=0;
|
|
create table t2 (n int) engine=innodb;
|
|
insert into t2 values (3);
|
|
disconnect con2;
|
|
connection con3;
|
|
select get_lock("lock1",60);
|
|
source include/show_binlog_events.inc;
|
|
do release_lock("lock1");
|
|
drop table t0,t2;
|
|
|
|
# Test for BUG#16559 (ROLLBACK should always have a zero error code in
|
|
# binlog). Has to be here and not earlier, as the SELECTs influence
|
|
# XIDs differently between normal and ps-protocol (and SHOW BINLOG
|
|
# EVENTS above read XIDs).
|
|
|
|
connect (con4,localhost,root,,);
|
|
connection con3;
|
|
reset master;
|
|
create table t1 (a int) engine=innodb;
|
|
create table t2 (a int) engine=myisam;
|
|
select get_lock("a",10);
|
|
begin;
|
|
insert into t1 values(8);
|
|
insert into t2 select * from t1;
|
|
disconnect con3;
|
|
|
|
connection con4;
|
|
select get_lock("a",10); # wait for rollback to finish
|
|
|
|
# we check that the error code of the "ROLLBACK" event is 0 and not
|
|
# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
|
|
# and does not make slave to stop)
|
|
--exec $MYSQL_BINLOG --start-position=547 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval select
|
|
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
|
|
is not null;
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
eval select
|
|
@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
|
|
@a not like "%#%error_code=%error_code=%";
|
|
drop table t1, t2;
|
|
|
|
#
|
|
# Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack
|
|
# bug #28960 non-trans temp table changes with insert .. select
|
|
# not binlogged after rollback
|
|
#
|
|
# testing appearence of insert into temp_table in binlog.
|
|
# There are two branches of execution that require different setup.
|
|
|
|
## send_eof() branch
|
|
|
|
# prepare
|
|
|
|
create temporary table tt (a int unique);
|
|
create table ti (a int) engine=innodb;
|
|
reset master;
|
|
show master status;
|
|
|
|
# action
|
|
|
|
begin;
|
|
insert into ti values (1);
|
|
insert into ti values (2) ;
|
|
insert into tt select * from ti;
|
|
rollback;
|
|
|
|
# check
|
|
|
|
select count(*) from tt /* 2 */;
|
|
show master status;
|
|
--replace_column 2 # 5 #
|
|
show binlog events from 98;
|
|
select count(*) from ti /* zero */;
|
|
insert into ti select * from tt;
|
|
select * from ti /* that is what slave would miss - a bug */;
|
|
|
|
|
|
## send_error() branch
|
|
delete from ti;
|
|
delete from tt where a=1;
|
|
reset master;
|
|
show master status;
|
|
|
|
# action
|
|
|
|
begin;
|
|
insert into ti values (1);
|
|
insert into ti values (2) /* to make the dup error in the following */;
|
|
--error ER_DUP_ENTRY
|
|
insert into tt select * from ti /* one affected and error */;
|
|
rollback;
|
|
|
|
# check
|
|
|
|
show master status;
|
|
--replace_column 2 # 5 #
|
|
show binlog events from 98;
|
|
select count(*) from ti /* zero */;
|
|
insert into ti select * from tt;
|
|
select * from tt /* that is what otherwise slave missed - the bug */;
|
|
|
|
drop table ti;
|
|
|
|
|
|
#
|
|
# Bug #27417 thd->no_trans_update.stmt lost value inside of SF-exec-stack
|
|
#
|
|
# Testing asserts: if there is a side effect of modifying non-transactional
|
|
# table thd->no_trans_update.stmt must be TRUE;
|
|
# the assert is active with debug build
|
|
#
|
|
|
|
--disable_warnings
|
|
drop function if exists bug27417;
|
|
drop table if exists t1,t2;
|
|
--enable_warnings
|
|
# side effect table
|
|
CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM;
|
|
# target tables
|
|
CREATE TABLE t2 (a int NOT NULL auto_increment, PRIMARY KEY (a));
|
|
|
|
delimiter |;
|
|
create function bug27417(n int)
|
|
RETURNS int(11)
|
|
begin
|
|
insert into t1 values (null);
|
|
return n;
|
|
end|
|
|
delimiter ;|
|
|
|
|
reset master;
|
|
|
|
# execute
|
|
|
|
insert into t2 values (bug27417(1));
|
|
insert into t2 select bug27417(2);
|
|
reset master;
|
|
|
|
--error ER_DUP_ENTRY
|
|
insert into t2 values (bug27417(2));
|
|
show master status; /* only (!) with fixes for #23333 will show there is the query */;
|
|
select count(*) from t1 /* must be 3 */;
|
|
|
|
reset master;
|
|
select count(*) from t2;
|
|
delete from t2 where a=bug27417(3);
|
|
select count(*) from t2 /* nothing got deleted */;
|
|
show master status; /* the query must be in regardless of #23333 */;
|
|
select count(*) from t1 /* must be 5 */;
|
|
|
|
--enable_info
|
|
delete t2 from t2 where t2.a=bug27417(100) /* must not affect t2 */;
|
|
--disable_info
|
|
select count(*) from t1 /* must be 7 */;
|
|
|
|
drop function bug27417;
|
|
drop table t1,t2;
|
|
|
|
--echo end of tests
|
|
|