diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
commit | cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb (patch) | |
tree | 8d4f7cd1c17be55f899e20a20f4b4f0b86a5fd53 /mysql-test/suite/wsrep | |
parent | 66f7f7998ceae4b6274c5e84738b2c0c8dfa3064 (diff) | |
parent | 820ebcec8651d2478ece554f059a5513f0b2bedf (diff) | |
download | mariadb-git-cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb.tar.gz |
Merge 10.9 into 10.10
Diffstat (limited to 'mysql-test/suite/wsrep')
-rw-r--r-- | mysql-test/suite/wsrep/common.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/wsrep/common.pm b/mysql-test/suite/wsrep/common.pm index 8ac3b3ea94c..54ce8826563 100644 --- a/mysql-test/suite/wsrep/common.pm +++ b/mysql-test/suite/wsrep/common.pm @@ -43,10 +43,10 @@ sub check_wsrep_support() { mtr_error("No SST scripts") unless $spath; $ENV{PATH}="$spath:$ENV{PATH}"; - # ADD mysql client library path to path so that wsrep_notify_cmd can find mysql - # client for loading the tables. (Don't assume each machine has mysql install) - my ($cpath) = grep { -f "$_/mysql"; } "$::bindir/scripts", $::path_client_bindir; - mtr_error("No scritps") unless $cpath; + # ADD mariadb client to path so that wsrep_notify_cmd can find mariadb + # client for loading the tables. (Don't assume each machine has mariadb installed) + my ($cpath) = grep { -f "$_/mariadb"; } "$::bindir/scripts", $::path_client_bindir; + mtr_error("No mariadb client found") unless $cpath; $ENV{PATH}="$cpath:$ENV{PATH}" unless $cpath eq $spath; # ADD my_print_defaults script path to path so that SST scripts can find it |