mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01: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
41 lines
1.1 KiB
Text
41 lines
1.1 KiB
Text
--source include/not_embedded.inc
|
|
|
|
--disable_service_connection
|
|
#
|
|
# SHUTDOWN statement
|
|
#
|
|
create user user1@localhost;
|
|
|
|
connect (c1,localhost,user1,,);
|
|
|
|
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
|
|
shutdown;
|
|
|
|
connection default;
|
|
disconnect c1;
|
|
--connect (c1,localhost,root,,)
|
|
|
|
create procedure try_shutdown() shutdown;
|
|
drop procedure try_shutdown;
|
|
|
|
--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
|
|
--source include/wait_until_disconnected.inc
|
|
|
|
--exec echo "restart" > $_expect_file_name
|
|
--enable_reconnect
|
|
--source include/wait_until_connected_again.inc
|
|
|
|
drop user user1@localhost;
|
|
|
|
--echo #
|
|
--echo # MDEV-8491 - On shutdown, report the user and the host executed that.
|
|
--echo #
|
|
--let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
|
|
--let SEARCH_PATTERN=mysqld(\.exe)? \(initiated by: root\[root\] @ localhost \[(::1)?\]\): Normal shutdown
|
|
--source include/search_pattern_in_file.inc
|
|
--enable_service_connection
|