Skip to content

Commit 8f4d7e3

Browse files
committed
MDEV-27775 : Some Galera tests fail on FreeBSD due to "unknown signal 9"
Replace 9 with KILL
1 parent 0812d0d commit 8f4d7e3

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

mysql-test/suite/galera/include/kill_galera.inc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
--echo Killing server ...
22

3+
if (!$kill_signal)
4+
{
5+
--let $kill_signal = KILL
6+
}
7+
38
# Write file to make mysql-test-run.pl expect the crash, but don't start it
49
--let $_server_id= `SELECT @@server_id`
510
--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
611
--exec echo "wait" > $_expect_file_name
712

813
# Kill the connected server
914
--disable_reconnect
15+
--let KILL_SIGNAL_VALUE = $kill_signal
1016
--let KILL_NODE_PIDFILE = `SELECT @@pid_file`
1117

1218
--perl
19+
my $kill_sig = $ENV{'KILL_SIGNAL_VALUE'}
1320
my $pid_filename = $ENV{'KILL_NODE_PIDFILE'};
1421
my $mysqld_pid = `cat $pid_filename`;
1522
chomp($mysqld_pid);
16-
system("kill -9 $mysqld_pid");
23+
system("kill -s $kill_sig $mysqld_pid");
1724
exit(0);
1825
EOF
1926

0 commit comments

Comments
 (0)