diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-22 00:58:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-22 02:27:00 +0200 |
| commit | f1ce69f3a9c01877c588c28eab9484fba8cd0e56 (patch) | |
| tree | 38e09211de3288dc660ebc5a40159cb9720d3ba7 /scripts | |
| parent | 3fbd4aa03208833001296e63847c7922ff0bdd8b (diff) | |
| parent | f8a800bec81983910a96a5dc38f3aeb9b7528bce (diff) | |
| download | mariadb-git-f1ce69f3a9c01877c588c28eab9484fba8cd0e56.tar.gz | |
Merge branch '10.1' into 10.2
But without f4f48e06215..f8a800bec81 - fixes for MDEV-12672
and related issues. 10.2 specific fix follows...
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/galera_recovery.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/galera_recovery.sh b/scripts/galera_recovery.sh index d734ceb7ac7..de2e653c497 100644 --- a/scripts/galera_recovery.sh +++ b/scripts/galera_recovery.sh @@ -69,7 +69,7 @@ parse_arguments() { wsrep_recover_position() { # Redirect server's error log to the log file. eval /usr/sbin/mysqld $cmdline_args --user=$user --wsrep_recover \ - --log-error="$log_file" + --disable-log-error 2> "$log_file" ret=$? if [ $ret -ne 0 ]; then # Something went wrong, let us also print the error log so that it diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 48baf61be3a..3a06f7e4858 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -245,7 +245,7 @@ wsrep_recover_position() { local euid=$(id -u) local ret=0 - local wr_logfile=$(mktemp $DATADIR/wsrep_recovery.XXXXXX) + local wr_logfile=$(mktemp wsrep_recovery.XXXXXX) # safety checks if [ -z $wr_logfile ]; then @@ -263,11 +263,11 @@ wsrep_recover_position() { local wr_pidfile="$DATADIR/"`@HOSTNAME@`"-recover.pid" - local wr_options="--log_error='$wr_logfile' --pid-file='$wr_pidfile'" + local wr_options="--disable-log-error --pid-file='$wr_pidfile'" log_notice "WSREP: Running position recovery with $wr_options" - eval_log_error "$mysqld_cmd --wsrep_recover $wr_options" + eval_log_error "$mysqld_cmd --wsrep_recover $wr_options 2> $wr_logfile" local rp="$(grep 'WSREP: Recovered position:' $wr_logfile)" if [ -z "$rp" ]; then |