mirror of
https://github.com/MariaDB/server.git
synced 2025-07-20 10:24:14 +03:00
7c91082e39
mtr uses group suffix, but some existing inc and test files use
server_id for expect files. This patch aims to fix that.
For spider:
With this change we will not have to maintain a separate version of
restart_mysqld.inc for spider, that duplicates code, just because
spider tests use different names for expect files, and shutdown_mysqld
requires magical names for them.
With this change spider tests will also be able to use other features
provided by restart_mysqld.inc without code duplication, like the
parameter $restart_parameters (see e.g. the testcase mdev_29904.test
in commit ef1161e5d4f).
Tests run after this change: default, spider, rocksdb, galera, using
the following command
mtr --parallel=auto --force --max-test-fail=0 --skip-core-file
mtr --suite spider,spider/*,spider/*/* \
--skip-test="spider/oracle.*|.*/t\..*" --parallel=auto --big-test \
--force --max-test-fail=0 --skip-core-file
mtr --suite galera --parallel=auto
mtr --suite rocksdb --parallel=auto
44 lines
1.3 KiB
Plaintext
44 lines
1.3 KiB
Plaintext
source include/have_innodb.inc;
|
|
source include/not_embedded.inc;
|
|
source include/have_debug.inc;
|
|
|
|
connect con1, localhost, root;
|
|
create table t1 (a int) engine=innodb;
|
|
insert t1 values (1),(2),(3),(4);
|
|
delete from t1 where a=1;
|
|
|
|
select user,state from information_schema.processlist order by 2;
|
|
|
|
set global debug_dbug='+d,only_kill_system_threads';
|
|
set global innodb_fast_shutdown=0;
|
|
|
|
--let $_expect_file_name= `select regexp_replace(@@tmpdir, '^.*/','')`
|
|
--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/$_expect_file_name.expect
|
|
exec echo "wait" > $_expect_file_name;
|
|
send shutdown;
|
|
|
|
connection default;
|
|
disconnect con1;
|
|
|
|
sleep 5;
|
|
select user,state from information_schema.processlist order by 2;
|
|
set global innodb_fast_shutdown=1;
|
|
|
|
let $wait_condition=select count(*) = 0 from information_schema.processlist where user='system user';
|
|
source include/wait_condition.inc;
|
|
select user,state from information_schema.processlist order by 2;
|
|
|
|
delete from t1 where a=3;
|
|
error ER_WRONG_VALUE_FOR_VAR;
|
|
set global innodb_fast_shutdown=0;
|
|
|
|
# Get id with space prefix to ensure that replace_result doesn't replace
|
|
# the error code
|
|
let $me=`select concat(' ', connection_id())`;
|
|
replace_result $me ID;
|
|
error ER_CONNECTION_KILLED;
|
|
eval kill $me;
|
|
|
|
source include/start_mysqld.inc;
|
|
drop table t1;
|