Skip to content

Commit 70283ac

Browse files
MDEV-32515 Use $MYSQLD_LAST_CMD in spider/bugfix.mdev_30370
$MYSQLD_CMD uses .1 as the defaults-group-suffix, which could cause the use of the default port (3306) or socket, which will fail in environment where these defaults are already in use by another server. Adding an extra --defaults-group-suffix=.1.1 does not help, because the first flag wins. So we use $MYSQLD_LAST_CMD instead, which uses the correct suffix. The extra innodb buffer pool warning is irrelevant to the goal of the test (running --wsrep-recover with --plug-load-add=ha_spider should not cause hang)
1 parent d8f5d2b commit 70283ac

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

storage/spider/mysql-test/spider/bugfix/r/mdev_30370.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
22
# MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
33
#
4+
call mtr.add_suppression(".*\\[Warning\\] InnoDB: Skipping buffer pool dump/restore during wsrep recovery");
45
# Kill the server
56
# restart
67
Warnings:

storage/spider/mysql-test/spider/bugfix/t/mdev_30370.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
--echo # MDEV-30370 mariadbd hangs when running with --wsrep-recover and --plugin-load-add=ha_spider.so
44
--echo #
55

6-
let $MYSQLD_DATADIR= `select @@datadir`;
7-
let $PLUGIN_DIR=`select @@plugin_dir`;
6+
call mtr.add_suppression(".*\\[Warning\\] InnoDB: Skipping buffer pool dump/restore during wsrep recovery");
87
--source include/kill_mysqld.inc
9-
--exec $MYSQLD_CMD --datadir=$MYSQLD_DATADIR --wsrep-recover --plugin-dir=$PLUGIN_DIR --plugin-load-add=ha_spider
8+
--exec $MYSQLD_LAST_CMD --wsrep-recover --plugin-load-add=ha_spider
109
--source include/start_mysqld.inc
1110
--disable_query_log
1211
--source ../../include/clean_up_spider.inc

0 commit comments

Comments
 (0)