Skip to content
Permalink
Browse files
MDEV-24962 addendum: mariabackup does not understand --log-bin-index …
…and --log-basename options
  • Loading branch information
sysprg committed May 5, 2021
1 parent 5ad7f52 commit 6895c9e
Showing 1 changed file with 13 additions and 3 deletions.
@@ -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,

0 comments on commit 6895c9e

Please sign in to comment.