mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
4189e7c85f
server testing cleanups. mysql-test/r/innodb.result: Update results mysql-test/r/insert_select-binlog.result: Update results mysql-test/r/mix_innodb_myisam_binlog.result: Update results mysql-test/r/ps_1general.result: Update results mysql-test/r/ps_grant.result: Update results mysql-test/r/view.result: Update results mysql-test/t/client_xml.test: Skip test with embedded server mysql-test/t/flush_read_lock_kill.test: Skip test with embedded server mysql-test/t/grant3.test: Skip test with embedded server mysql-test/t/information_schema.test: Skip test with embedded server mysql-test/t/innodb.test: Fix up filenames mysql-test/t/multi_update.test: Skip test with embedded server mysql-test/t/mysqlshow.test: Skip test with embedded server mysql-test/t/ps_1general.test: Move grant-related tests to ps_grant, and fix cleanup of filename mysql-test/t/ps_grant.test: Add additional tests mysql-test/t/sp-security.test: Skip test with embedded server mysql-test/t/user_limits.test: Skip test with embedded server mysql-test/t/view.test: Split grant-related tests to new test file view_grant
49 lines
1.5 KiB
Text
49 lines
1.5 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
|
|
|
|
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,1053
|
|
reap;
|
|
|
|
connection con2;
|
|
drop table t1;
|