diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-05-05 03:17:51 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-05-05 03:17:50 +0200 |
| commit | ded23b40174844b8bd4c3931e03f6204526f2406 (patch) | |
| tree | a0106bbd886a86be7a4c2c5ac87e004ce79ddf89 | |
| parent | 5ad7f52558cb283c685322df1fcdbd10daf3c3ae (diff) | |
| download | mariadb-git-10.2-MDEV-24962-add.tar.gz | |
MDEV-24962 addendum: mariabackup does not understand --log-bin-index and --log-basename options10.2-MDEV-24962-add
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index 9e6807e20a3..3c0fbfff058 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -349,7 +349,7 @@ case "$1" in fi shift done - readonly WSREP_SST_OPT_MYSQLD="$original_cmd" + WSREP_SST_OPT_MYSQLD="$original_cmd" break ;; *) # must be command @@ -410,7 +410,11 @@ fi # Reconstructing the command line arguments that control the innodb # and binlog options: if [ -n "$WSREP_SST_OPT_LOG_BASENAME" ]; then - INNOEXTRA="$INNOEXTRA --log-basename='$WSREP_SST_OPT_LOG_BASENAME'" + if [ -n "$WSREP_SST_OPT_MYSQLD" ]; then + WSREP_SST_OPT_MYSQLD="--log-basename='$WSREP_SST_OPT_LOG_BASENAME' $WSREP_SST_OPT_MYSQLD" + else + WSREP_SST_OPT_MYSQLD="--log-basename='$WSREP_SST_OPT_LOG_BASENAME'" + fi fi if [ -n "$INNODB_DATA_HOME_DIR" ]; then INNOEXTRA="$INNOEXTRA --innodb-data-home-dir='$INNODB_DATA_HOME_DIR'" @@ -424,10 +428,16 @@ fi if [ -n "$WSREP_SST_OPT_BINLOG" ]; then INNOEXTRA="$INNOEXTRA --log-bin='$WSREP_SST_OPT_BINLOG'" if [ -n "$WSREP_SST_OPT_BINLOG_INDEX" ]; then - INNOEXTRA="$INNOEXTRA --log-bin-index='$WSREP_SST_OPT_BINLOG_INDEX'" + if [ -n "$WSREP_SST_OPT_MYSQLD" ]; then + WSREP_SST_OPT_MYSQLD="--log-bin-index='$WSREP_SST_OPT_BINLOG_INDEX' $WSREP_SST_OPT_MYSQLD" + else + WSREP_SST_OPT_MYSQLD="--log-bin-index='$WSREP_SST_OPT_BINLOG_INDEX'" + fi fi fi +readonly WSREP_SST_OPT_MYSQLD + get_binlog() { # if no command line argument and WSREP_SST_OPT_BINLOG is not set, |