Commit 6895c9ea authored by Julius Goryavsky's avatar Julius Goryavsky

MDEV-24962 addendum: mariabackup does not understand --log-bin-index and --log-basename options

parent 5ad7f525
...@@ -349,7 +349,7 @@ case "$1" in ...@@ -349,7 +349,7 @@ case "$1" in
fi fi
shift shift
done done
readonly WSREP_SST_OPT_MYSQLD="$original_cmd" WSREP_SST_OPT_MYSQLD="$original_cmd"
break break
;; ;;
*) # must be command *) # must be command
...@@ -410,7 +410,11 @@ fi ...@@ -410,7 +410,11 @@ fi
# Reconstructing the command line arguments that control the innodb # Reconstructing the command line arguments that control the innodb
# and binlog options: # and binlog options:
if [ -n "$WSREP_SST_OPT_LOG_BASENAME" ]; then 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 fi
if [ -n "$INNODB_DATA_HOME_DIR" ]; then if [ -n "$INNODB_DATA_HOME_DIR" ]; then
INNOEXTRA="$INNOEXTRA --innodb-data-home-dir='$INNODB_DATA_HOME_DIR'" INNOEXTRA="$INNOEXTRA --innodb-data-home-dir='$INNODB_DATA_HOME_DIR'"
...@@ -424,10 +428,16 @@ fi ...@@ -424,10 +428,16 @@ fi
if [ -n "$WSREP_SST_OPT_BINLOG" ]; then if [ -n "$WSREP_SST_OPT_BINLOG" ]; then
INNOEXTRA="$INNOEXTRA --log-bin='$WSREP_SST_OPT_BINLOG'" INNOEXTRA="$INNOEXTRA --log-bin='$WSREP_SST_OPT_BINLOG'"
if [ -n "$WSREP_SST_OPT_BINLOG_INDEX" ]; then 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
fi fi
readonly WSREP_SST_OPT_MYSQLD
get_binlog() get_binlog()
{ {
# if no command line argument and WSREP_SST_OPT_BINLOG is not set, # if no command line argument and WSREP_SST_OPT_BINLOG is not set,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment