diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-12 18:50:59 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-12 18:50:59 -0400 |
| commit | 6ae27e40985ef8c647ac2271c091f67511fb421f (patch) | |
| tree | 08d1736de665cccf3fbd772e49ee45d307d5e1fd /scripts | |
| parent | c6c9a69ccee3325cfdd77d0dcd49259a574363b0 (diff) | |
| parent | 014fe12c03a2fdcbd2eb6bab39118de1cee02693 (diff) | |
| download | mariadb-git-6ae27e40985ef8c647ac2271c091f67511fb421f.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index 46f4076111f..e23afc94511 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -124,6 +124,32 @@ else MY_PRINT_DEFAULTS=$(which my_print_defaults) fi +# try to use my_print_defaults, mysql and mysqldump that come with the sources +# (for MTR suite) +SCRIPTS_DIR="$(cd $(dirname "$0"); pwd -P)" +EXTRA_DIR="$SCRIPTS_DIR/../extra" +CLIENT_DIR="$SCRIPTS_DIR/../client" + +if [ -x "$CLIENT_DIR/mysql" ]; then + MYSQL_CLIENT="$CLIENT_DIR/mysql" +else + MYSQL_CLIENT=$(which mysql) +fi + +if [ -x "$CLIENT_DIR/mysqldump" ]; then + MYSQLDUMP="$CLIENT_DIR/mysqldump" +else + MYSQLDUMP=$(which mysqldump) +fi + +if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then + MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults" +elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then + MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults" +else + MY_PRINT_DEFAULTS=$(which my_print_defaults) +fi + # For Bug:1200727 if $MY_PRINT_DEFAULTS -c $WSREP_SST_OPT_CONF sst | grep -q "wsrep_sst_auth";then if [ -z "$WSREP_SST_OPT_AUTH" -o "$WSREP_SST_OPT_AUTH" = "(null)" ];then |