mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 17:44:29 +03:00
A lot of small fixes and new test cases. client/mysqlbinlog.cc: Cast removed client/mysqltest.cc: Added missing DBUG_RETURN include/my_pthread.h: set_timespec_time_nsec() now only takes one argument mysql-test/t/date_formats.test: Remove --disable_ps_protocl as now also ps supports microseconds mysys/my_uuid.c: Changed to use my_interval_timer() instead of my_getsystime() mysys/waiting_threads.c: Changed to use my_hrtime() sql/field.h: Added bool special_const_compare() for fields that may convert values before compare (like year) sql/field_conv.cc: Added test to get optimal copying of identical temporal values. sql/item.cc: Return that item_int is equal if it's positive, even if unsigned flag is different. Fixed Item_cache_str::save_in_field() to have identical null check as other similar functions Added proper NULL check to Item_cache_int::save_in_field() sql/item_cmpfunc.cc: Don't call convert_constant_item() if there is nothing that is worth converting. Simplified test when years should be converted sql/item_sum.cc: Mark cache values in Item_sum_hybrid as not constants to ensure they are not replaced by other cache values in compare_datetime() sql/item_timefunc.cc: Changed sec_to_time() to take a my_decimal argument to ensure we don't loose any sub seconds. Added Item_temporal_func::get_time() (This simplifies some things) sql/mysql_priv.h: Added Lazy_string_decimal() sql/mysqld.cc: Added my_decimal constants max_seconds_for_time_type, time_second_part_factor sql/table.cc: Changed expr_arena to be of type CONVENTIONAL_EXECUTION to ensure that we don't loose any items that are created by fix_fields() sql/tztime.cc: TIME_to_gmt_sec() now sets *in_dst_time_gap in case of errors This is needed to be able to detect if timestamp is 0 storage/maria/lockman.c: Changed from my_getsystime() to set_timespec_time_nsec() storage/maria/ma_loghandler.c: Changed from my_getsystime() to my_hrtime() storage/maria/ma_recovery.c: Changed from my_getsystime() to mmicrosecond_interval_timer() storage/maria/unittest/trnman-t.c: Changed from my_getsystime() to mmicrosecond_interval_timer() storage/xtradb/handler/ha_innodb.cc: Added support for new time,datetime and timestamp unittest/mysys/thr_template.c: my_getsystime() -> my_interval_timer() unittest/mysys/waiting_threads-t.c: my_getsystime() -> my_interval_timer()
358 lines
9.1 KiB
Plaintext
358 lines
9.1 KiB
Plaintext
-- source include/have_innodb.inc
|
|
-- source include/have_binlog_format_statement.inc
|
|
-- source include/binlog_start_pos.inc
|
|
|
|
# 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_warnings
|
|
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where info like "%insert into t2 values%" and state like 'User lock';
|
|
--source include/wait_condition.inc
|
|
|
|
--replace_regex /[0-9]+/ID/
|
|
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`;
|
|
|
|
--let $binlog_killed_pos=query_get_value(SHOW BINLOG EVENTS, Pos, 3)
|
|
--let $binlog_killed_end_log_pos=query_get_value(SHOW BINLOG EVENTS, End_log_pos, 3)
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_killed_pos --stop-position=$binlog_killed_end_log_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
|
|
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
|
--disable_result_log
|
|
eval select
|
|
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
|
|
is not null;
|
|
--enable_result_log
|
|
--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_warnings
|
|
--enable_abort_on_error
|
|
|
|
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,ER_LOCK_WAIT_TIMEOUT
|
|
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)
|
|
NOT 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 on the 3th line
|
|
source include/show_binlog_events.inc;
|
|
--let $binlog_killed_pos= query_get_value(SHOW BINLOG EVENTS, Pos, 3)
|
|
--let $binlog_killed_end_log_pos= query_get_value(SHOW BINLOG EVENTS, End_log_pos, 3)
|
|
|
|
--echo *** a proof the query is binlogged with an error ***
|
|
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_killed_pos --stop-position=$binlog_killed_end_log_pos $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 update 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 on the 3th line
|
|
source include/show_binlog_events.inc;
|
|
--let $binlog_killed_pos= query_get_value(SHOW BINLOG EVENTS, Pos, 3)
|
|
--let $binlog_killed_end_log_pos= query_get_value(SHOW BINLOG EVENTS, End_log_pos, 3)
|
|
|
|
# a proof the query is binlogged with an error
|
|
|
|
--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_killed_pos --stop-position=$binlog_killed_end_log_pos $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 delete 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
|