mirror of
https://github.com/MariaDB/server.git
synced 2025-05-10 02:01:19 +03:00
5ef63a4f1c
If a thread is killed in the server, we throw "shutdown" only if one is actually in progress; otherwise, we throw "query interrupted". Control-C in the mysql command-line client is "incremental" now. First Control-C sends KILL QUERY (when connected to 5.0+ server, otherwise, see next) Next Control-C sends KILL CONNECTION Next Control-C aborts client. As the first two steps only pertain to an existing query, Control-C will abort the client right away if no query is running. client will give more detailed/consistent feedback on Control-C now. client/mysql.cc: Extends Control-C handling; enhances up feedback to user. On 5.0+ servers, we try to be nice and send KILL QUERY first if Control-C is pressed in the command-line client, but if that doesn't work, we now give the user the opportunity to send KILL CONNECTION with another Control-C (and to kill the client with another Control-C if that somehow doesn't work either). mysql-test/t/flush_read_lock_kill.test: we're getting correct "thread killed" rather than "in shutdown" error now mysql-test/t/kill.test: we're getting correct "thread killed" rather than "in shutdown" error now mysql-test/t/rpl000001.test: we're getting correct "thread killed" rather than "in shutdown" error now mysql-test/t/rpl_error_ignored_table.test: we're getting correct "thread killed" rather than "in shutdown" error now sql/records.cc: make error messages on KILL uniform for rr_*() by folding that handling into rr_handle_error() sql/sql_class.h: Only throw "shutdown" when we have one flagged as being in progress; otherwise, throw "query interrupted" as it's likely to be "KILL CONNECTION" or related.
61 lines
1.7 KiB
Plaintext
61 lines
1.7 KiB
Plaintext
# Test for
|
|
# Bug #797: If a query is ignored on slave (replicate-ignore-table) the slave
|
|
# still checks that it has the same error as on the master.
|
|
|
|
source include/master-slave.inc;
|
|
connection master;
|
|
create table t1 (a int primary key);
|
|
# generate an error that goes to the binlog
|
|
--error 1062
|
|
insert into t1 values (1),(1);
|
|
save_master_pos;
|
|
connection slave;
|
|
# as the t1 table is ignored on the slave, the slave should be able to sync
|
|
sync_with_master;
|
|
# The port number is different when doing the release build with
|
|
# Do-compile, hence we have to replace the port number here accordingly
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 8 # 9 # 23 # 33 #
|
|
show slave status;
|
|
# check that the table has been ignored, because otherwise the test is nonsense
|
|
show tables like 't1';
|
|
connection master;
|
|
drop table t1;
|
|
save_master_pos;
|
|
connection slave;
|
|
sync_with_master;
|
|
|
|
# Now test that even critical errors (connection killed)
|
|
# are ignored if rules allow it.
|
|
# The "kill" idea was copied from rpl000001.test.
|
|
|
|
connection master1;
|
|
select get_lock('crash_lock%20C', 10);
|
|
|
|
connection master;
|
|
create table t2 (a int primary key);
|
|
insert into t2 values(1);
|
|
create table t3 (id int);
|
|
insert into t3 values(connection_id());
|
|
send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
|
|
|
|
connection master1;
|
|
real_sleep 2;
|
|
select (@id := id) - id from t3;
|
|
kill @id;
|
|
drop table t2,t3;
|
|
connection master;
|
|
--error 0,1317,2013
|
|
reap;
|
|
connection master1;
|
|
--replace_column 2 # 5 #
|
|
show binlog events from 98;
|
|
save_master_pos;
|
|
connection slave;
|
|
# SQL slave thread should not have stopped (because table of the killed
|
|
# query is in the ignore list).
|
|
sync_with_master;
|
|
|
|
# End of 4.1 tests
|
|
# Adding comment for force manual merge 5.0 -> wl1012. delete me if needed
|