Skip to content

Commit cade21b

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

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (!$kill_signal)
1616
--let KILL_NODE_PIDFILE = `SELECT @@pid_file`
1717

1818
--perl
19-
my $kill_sig = $ENV{'KILL_SIGNAL_VALUE'}
19+
my $kill_sig = $ENV{'KILL_SIGNAL_VALUE'};
2020
my $pid_filename = $ENV{'KILL_NODE_PIDFILE'};
2121
my $mysqld_pid = `cat $pid_filename`;
2222
chomp($mysqld_pid);

mysql-test/suite/galera/r/galera_ist_restart_joiner.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ SET SESSION wsrep_on=ON;
1616
connection node_1;
1717
UPDATE t1 SET f2 = 'd' WHERE f1 > 3;
1818
connection node_2;
19+
Killing server ...
1920
connection node_1;
2021
UPDATE t1 SET f2 = 'e' WHERE f1 > 4;
2122
connection node_2;

mysql-test/suite/galera/t/galera_ist_restart_joiner.test

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,7 @@ UPDATE t1 SET f2 = 'd' WHERE f1 > 3;
6363

6464
# Kill node #2 while IST is in progress
6565
--connection node_2
66-
67-
# Kill the connected server
68-
--disable_reconnect
69-
70-
--perl
71-
my $pid_filename = $ENV{'KILL_NODE_PIDFILE'};
72-
my $mysqld_pid = `cat $pid_filename`;
73-
chomp($mysqld_pid);
74-
system("kill -9 $mysqld_pid");
75-
exit(0);
76-
EOF
77-
78-
--source include/wait_until_disconnected.inc
66+
--source include/kill_galera.inc
7967

8068
--connection node_1
8169
--source include/wait_until_connected_again.inc

0 commit comments

Comments
 (0)