mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
3f42e4bd24
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.
66 lines
2 KiB
Text
66 lines
2 KiB
Text
# Let's see if FLUSH TABLES WITH READ LOCK can be killed when waiting
|
|
# for running commits to finish (in the past it could not)
|
|
# This will not be a meaningful test on non-debug servers so will be
|
|
# skipped.
|
|
# If running mysql-test-run --debug, the --debug added by
|
|
# mysql-test-run to the mysqld command line will override the one of
|
|
# -master.opt. But this test is designed to still pass then (though it
|
|
# won't test anything interesting).
|
|
|
|
# This also won't work with the embedded server test
|
|
--source include/not_embedded.inc
|
|
|
|
--source include/have_debug.inc
|
|
|
|
# Save the initial number of concurrent sessions
|
|
--source include/count_sessions.inc
|
|
|
|
# Disable concurrent inserts to avoid test failures when reading the
|
|
# connection id which was inserted into a table by another thread.
|
|
SET @old_concurrent_insert= @@global.concurrent_insert;
|
|
SET @@global.concurrent_insert= 0;
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
connection con1;
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
CREATE TABLE t1 (kill_id INT);
|
|
INSERT INTO t1 VALUES(connection_id());
|
|
|
|
# Thanks to the parameter we passed to --debug, this FLUSH will
|
|
# block on a debug build running with our --debug=make_global... It
|
|
# will block until killed. In other cases (non-debug build or other
|
|
# --debug) it will succeed immediately
|
|
|
|
connection con1;
|
|
send FLUSH TABLES WITH READ LOCK;
|
|
|
|
# kill con1
|
|
connection con2;
|
|
SELECT ((@id := kill_id) - kill_id) FROM t1;
|
|
|
|
--sleep 2 # leave time for FLUSH to block
|
|
KILL CONNECTION @id;
|
|
|
|
connection con1;
|
|
# On debug builds it will be error 1053 (killed); on non-debug, or
|
|
# debug build running without our --debug=make_global..., will be
|
|
# error 0 (no error). The only important thing to test is that on
|
|
# debug builds with our --debug=make_global... we don't hang forever.
|
|
--error 0,1317,2013
|
|
reap;
|
|
|
|
connection con2;
|
|
DROP TABLE t1;
|
|
connection default;
|
|
disconnect con2;
|
|
|
|
# Restore global concurrent_insert value
|
|
SET @@global.concurrent_insert= @old_concurrent_insert;
|
|
|
|
# Wait till all disconnects are completed
|
|
--source include/wait_until_count_sessions.inc
|
|
|