mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
cf5ebc5821
Clarified error messages related to unsafe statements: - avoid the internal technical term "row injection" - use 'binary log' instead of 'binlog' - avoid the word 'unsafeness' mysql-test/extra/binlog_tests/blackhole.test: updated suppression pattern mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: updated suppression pattern mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test: updated suppression pattern mysql-test/extra/rpl_tests/rpl_insert_id.test: updated suppression pattern mysql-test/extra/rpl_tests/rpl_loaddata.test: updated suppression pattern mysql-test/extra/rpl_tests/rpl_mixing_engines.test: updated suppression pattern mysql-test/extra/rpl_tests/rpl_start_stop_slave.test: updated suppression pattern mysql-test/extra/rpl_tests/rpl_stm_000001.test: updated suppression pattern mysql-test/extra/rpl_tests/rpl_stop_middle_group.test: updated suppression pattern mysql-test/r/archive.result: updated result file mysql-test/r/commit_1innodb.result: updated result file mysql-test/r/ctype_cp932_binlog_stm.result: updated result file mysql-test/r/partition_innodb_stmt.result: updated result file mysql-test/suite/binlog/r/binlog_innodb.result: updated result file mysql-test/suite/binlog/r/binlog_killed.result: updated result file mysql-test/suite/binlog/r/binlog_multi_engine.result: updated result file mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: updated result file mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result: updated result file mysql-test/suite/binlog/r/binlog_stm_blackhole.result: updated result file mysql-test/suite/binlog/r/binlog_stm_do_db.result: updated result file mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: updated result file mysql-test/suite/binlog/r/binlog_stm_ps.result: updated result file mysql-test/suite/binlog/r/binlog_stm_row.result: updated result file mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result: updated result file mysql-test/suite/binlog/r/binlog_unsafe.result: updated result file mysql-test/suite/binlog/t/binlog_killed.test: updated suppression pattern mysql-test/suite/binlog/t/binlog_multi_engine.test: updated suppression pattern mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test: updated suppression pattern mysql-test/suite/binlog/t/binlog_stm_ps.test: updated suppression pattern mysql-test/suite/binlog/t/binlog_stm_row.test: updated suppression pattern mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test: updated suppression pattern mysql-test/suite/binlog/t/binlog_tmp_table.test: updated suppression pattern mysql-test/suite/binlog/t/binlog_unsafe.test: updated suppression pattern mysql-test/suite/ndb/r/ndb_binlog_format.result: updated result file mysql-test/suite/ndb/t/ndb_binlog_format.test: updated suppression pattern mysql-test/suite/perfschema/r/binlog_stmt.result: updated result file mysql-test/suite/perfschema/t/binlog_stmt.test: updated suppression pattern mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result: updated result file mysql-test/suite/rpl/r/rpl_blackhole.result: updated result file mysql-test/suite/rpl/r/rpl_concurrency_error.result: updated result file mysql-test/suite/rpl/r/rpl_get_lock.result: updated result file mysql-test/suite/rpl/r/rpl_insert_id.result: updated result file mysql-test/suite/rpl/r/rpl_insert_ignore.result: updated result file mysql-test/suite/rpl/r/rpl_misc_functions.result: updated result file mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result: updated result file mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result: updated result file mysql-test/suite/rpl/r/rpl_mysql_upgrade.result: updated result file mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: updated result file mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result: updated result file mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result: updated result file mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result: updated result file mysql-test/suite/rpl/r/rpl_read_only.result: updated result file mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result: updated result file mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result: updated result file mysql-test/suite/rpl/r/rpl_row_mixing_engines.result: updated result file mysql-test/suite/rpl/r/rpl_slow_query_log.result: updated result file mysql-test/suite/rpl/r/rpl_sp.result: updated result file mysql-test/suite/rpl/r/rpl_stm_000001.result: updated result file mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result: updated result file mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result: updated result file mysql-test/suite/rpl/r/rpl_stm_loadfile.result: updated result file mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result: updated result file mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result: updated result file mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result: updated result file mysql-test/suite/rpl/r/rpl_temp_temporary.result: updated result file mysql-test/suite/rpl/r/rpl_variables_stm.result: updated result file mysql-test/suite/rpl/t/rpl000013.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_blackhole.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_concurrency_error.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_err_ignoredtable.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_get_lock.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_insert.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_insert_id.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_insert_ignore.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_invoked_features.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_misc_functions.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_mysql_upgrade.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_optimize.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_read_only.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_semi_sync.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_semi_sync_event.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_session_var.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_slow_query_log.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_sp.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_stm_found_rows.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_stm_loadfile.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_temp_table.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_temp_temporary.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_temporary.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_timezone.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_trigger.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_udf.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_user_variables.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_variables_stm.test: updated suppression pattern mysql-test/suite/rpl/t/rpl_view_multi.test: updated suppression pattern mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result: updated result file mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test: updated suppression pattern mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test: updated suppression pattern mysql-test/suite/sys_vars/t/rpl_init_slave_func.test: updated suppression pattern mysql-test/t/archive.test: updated suppression pattern mysql-test/t/commit_1innodb.test: updated suppression pattern mysql-test/t/create_select_tmp.test: updated suppression pattern mysql-test/t/ctype_cp932_binlog_stm.test: updated suppression pattern mysql-test/t/lock_sync.test: updated suppression pattern mysql-test/t/mysqlbinlog.test: updated suppression pattern mysql-test/t/mysqldump.test: updated suppression pattern mysql-test/t/sp_trans.test: updated suppression pattern sql/log_event.cc: Clarified error message. sql/share/errmsg-utf8.txt: Clarified error messages.
345 lines
8.3 KiB
Text
345 lines
8.3 KiB
Text
-- source include/have_innodb.inc
|
|
-- source include/have_binlog_format_statement.inc
|
|
|
|
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
|
|
|
|
# You cannot use `KILL' with the Embedded MySQL Server library,
|
|
# because the embedded server merely runs inside the threads of the host
|
|
# application. -- the docs
|
|
|
|
-- source include/not_embedded.inc
|
|
|
|
###
|
|
### bug#22725 : incorrect killed error in binlogged query
|
|
###
|
|
|
|
connect (con1, localhost, root,,);
|
|
connect (con2, localhost, root,,);
|
|
|
|
create table t1 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB;
|
|
create table t2 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=MyISAM;
|
|
create table t3 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB;
|
|
|
|
#
|
|
# effective test for bug#22725
|
|
#
|
|
|
|
connection con1;
|
|
select get_lock("a", 20);
|
|
|
|
connection con2;
|
|
let $ID= `select connection_id()`;
|
|
|
|
#
|
|
# reset master does not reset binlogging on the embedded server.
|
|
# the test is not run on the embedded for reason of using KILL query.
|
|
# `reset master' problem is to be addressed by bug#15580 fixes.
|
|
#
|
|
reset master;
|
|
send insert into t2 values (null, null), (null, get_lock("a", 10));
|
|
|
|
|
|
connection con1;
|
|
|
|
disable_abort_on_error;
|
|
disable_query_log;
|
|
disable_result_log;
|
|
|
|
eval kill query $ID;
|
|
|
|
connection con2;
|
|
--error 0,ER_QUERY_INTERRUPTED
|
|
reap;
|
|
let $rows= `select count(*) from t2 /* must be 2 or 0 */`;
|
|
|
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=175 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval select
|
|
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
|
|
is not null;
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
let $error_code= `select @a like "%#%error_code=0%" /* must return 1 or 0*/`;
|
|
let $insert_binlogged= `select @a like "%insert into%" /* must return 1 or 0 */`;
|
|
eval set @result= $rows- $error_code - $insert_binlogged;
|
|
|
|
enable_abort_on_error;
|
|
enable_query_log;
|
|
enable_result_log;
|
|
|
|
select @result /* must be zero either way */;
|
|
|
|
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
|
|
connection con1;
|
|
select RELEASE_LOCK("a");
|
|
|
|
#
|
|
# bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
|
|
#
|
|
|
|
# checking that killing inside of select loops is safe as before
|
|
# killing after the loop can be only simulated - another test
|
|
|
|
delete from t1;
|
|
delete from t2;
|
|
insert into t1 values (1,1),(2,2);
|
|
|
|
#
|
|
# simple update
|
|
#
|
|
connection con1;
|
|
begin; update t1 set b=11 where a=2;
|
|
|
|
connection con2;
|
|
let $ID= `select connection_id()`;
|
|
begin;
|
|
send update t1 set b=b+10;
|
|
|
|
connection con1;
|
|
--replace_result $ID ID
|
|
eval kill query $ID;
|
|
rollback;
|
|
|
|
# Bug #32148 killi query may be ineffective
|
|
# forced to comment out the test's outcome
|
|
# and mask out ineffective ER_QUERY_INTERRUPTED
|
|
# todo1: revert back upon fixing bug#32148
|
|
# todo2: the tests need refining in that
|
|
# killing should wait till the victim requested
|
|
# its lock (wait_condition available in 5.1 tests)
|
|
|
|
connection con2;
|
|
--error 0,ER_QUERY_INTERRUPTED
|
|
reap;
|
|
rollback;
|
|
select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
|
|
|
|
#
|
|
# multi update
|
|
# commented out as Bug #31807 multi-update,delete killing does not report with ER_QUERY_INTERRUPTED
|
|
# in the way
|
|
#
|
|
# connection con1;
|
|
# begin; update t1 set b=b+10;
|
|
|
|
# connection con2;
|
|
# send update t1 as t_1,t1 as t_2 set t_1.b=11 where t_2.a=2;
|
|
|
|
# connection con1;
|
|
# --replace_result $ID ID
|
|
# eval kill query $ID;
|
|
# rollback;
|
|
|
|
# disable_abort_on_error;
|
|
|
|
# connection con2;
|
|
# --error HY000,ER_QUERY_INTERRUPTED
|
|
# reap;
|
|
# select * from t1 /* must be the same as before (1,1),(2,2) */;
|
|
|
|
# enable_abort_on_error;
|
|
#
|
|
# simple delete
|
|
#
|
|
connection con1;
|
|
begin; delete from t1 where a=2;
|
|
|
|
connection con2;
|
|
let $ID= `select connection_id()`;
|
|
begin;
|
|
send delete from t1 where a=2;
|
|
|
|
connection con1;
|
|
--replace_result $ID ID
|
|
eval kill query $ID;
|
|
rollback;
|
|
|
|
connection con2;
|
|
--error 0,ER_QUERY_INTERRUPTED
|
|
reap;
|
|
rollback;
|
|
# todo1,2 above
|
|
select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
|
|
|
|
|
|
#
|
|
# multi delete
|
|
# the same as for multi-update
|
|
#
|
|
# connection con1;
|
|
# begin; delete from t1 where a=2;
|
|
|
|
# connection con2;
|
|
# send delete t1 from t1 where t1.a=2;
|
|
|
|
# connection con1;
|
|
# --replace_result $ID ID
|
|
# eval kill query $ID;
|
|
# rollback;
|
|
|
|
# connection con2;
|
|
# --error 0,ER_QUERY_INTERRUPTED
|
|
# reap;
|
|
# select * from t1 /* must be the same as before (1,1),(2,2) */;
|
|
#
|
|
# insert select
|
|
#
|
|
connection con1;
|
|
--disable_warnings
|
|
drop table if exists t4;
|
|
--enable_warnings
|
|
create table t4 (a int, b int) engine=innodb;
|
|
insert into t4 values (3, 3);
|
|
begin; insert into t1 values (3, 3);
|
|
|
|
connection con2;
|
|
let $ID= `select connection_id()`;
|
|
begin;
|
|
send insert into t1 select * from t4 for update;
|
|
|
|
connection con1;
|
|
--replace_result $ID ID
|
|
eval kill query $ID;
|
|
rollback;
|
|
|
|
connection con2;
|
|
--error 0,ER_QUERY_INTERRUPTED
|
|
reap;
|
|
# todo 1,2 above
|
|
rollback;
|
|
select * from t1 /* must be the same as before (1,1),(2,2) */;
|
|
|
|
drop table t4; # cleanup for the sub-case
|
|
|
|
###
|
|
## non-ta table case: killing must be recorded in binlog
|
|
###
|
|
create table t4 (a int, b int) ENGINE=MyISAM /* for killing update and delete */;
|
|
|
|
delimiter |;
|
|
create function bug27563(n int)
|
|
RETURNS int(11)
|
|
DETERMINISTIC
|
|
begin
|
|
if @b > 0 then
|
|
select get_lock("a", 20) into @a;
|
|
else
|
|
set @b= 1;
|
|
end if;
|
|
return n;
|
|
end|
|
|
delimiter ;|
|
|
|
|
#
|
|
# update
|
|
#
|
|
|
|
delete from t4;
|
|
insert into t4 values (1,1), (1,1);
|
|
reset master;
|
|
connection con1;
|
|
select get_lock("a", 20);
|
|
|
|
connection con2;
|
|
let $ID= `select connection_id()`;
|
|
set @b= 0;
|
|
send update t4 set b=b + bug27563(b);
|
|
|
|
connection con1;
|
|
let $wait_condition= select count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
|
|
source include/wait_condition.inc;
|
|
select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
|
|
|
|
--replace_result $ID ID
|
|
eval kill query $ID;
|
|
|
|
connection con2;
|
|
--error ER_QUERY_INTERRUPTED
|
|
reap;
|
|
select * from t4 order by b /* must be (1,1), (1,2) */;
|
|
select @b /* must be 1 at the end of a stmt calling bug27563() */;
|
|
--echo must have the update query event more to FD
|
|
source include/show_binlog_events.inc;
|
|
|
|
# a proof the query is binlogged with an error
|
|
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval select
|
|
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null;
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`;
|
|
eval select $error_code /* must return 0 to mean the killed query is in */;
|
|
|
|
# cleanup for the sub-case
|
|
connection con1;
|
|
select RELEASE_LOCK("a");
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
|
|
|
|
#
|
|
# delete
|
|
#
|
|
|
|
delete from t4;
|
|
insert into t4 values (1,1), (2,2);
|
|
reset master;
|
|
connection con1;
|
|
select get_lock("a", 20);
|
|
|
|
connection con2;
|
|
let $ID= `select connection_id()`;
|
|
set @b= 0;
|
|
send delete from t4 where b=bug27563(1) or b=bug27563(2);
|
|
|
|
connection con1;
|
|
let $wait_condition= select count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
|
|
source include/wait_condition.inc;
|
|
select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
|
|
--replace_result $ID ID
|
|
eval kill query $ID;
|
|
|
|
connection con2;
|
|
--error ER_QUERY_INTERRUPTED
|
|
reap;
|
|
select count(*) from t4 /* must be 1 */;
|
|
select @b /* must be 1 at the end of a stmt calling bug27563() */;
|
|
--echo must have the delete query event more to FD
|
|
source include/show_binlog_events.inc;
|
|
|
|
# a proof the query is binlogged with an error
|
|
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
eval select
|
|
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
|
|
is not null;
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`;
|
|
eval select $error_code /* must return 0 to mean the killed query is in */;
|
|
|
|
# cleanup for the sub-case
|
|
connection con1;
|
|
select RELEASE_LOCK("a");
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
|
|
|
|
drop table t4;
|
|
|
|
#
|
|
# load data - see simulation tests
|
|
#
|
|
|
|
|
|
# bug#27571 cleanup
|
|
|
|
drop function bug27563;
|
|
|
|
|
|
#
|
|
# common cleanup
|
|
#
|
|
|
|
drop table t1,t2,t3;
|
|
|
|
--echo end of the tests
|