summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-07-22 19:00:49 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-07-27 17:38:38 -0400
commitb522c71e4be54708dc935f0ad5347fd4b06199ef (patch)
tree36a8256c33ce3915c934492d2e46a419c2c34bec /scripts
parenta63ceaeab10fc1fc72f5853ce14b278da95579b4 (diff)
downloadmariadb-git-b522c71e4be54708dc935f0ad5347fd4b06199ef.tar.gz
MDEV-10396: MariaDB does not restart after upgrade on debian 8
During wsrep position recovery, galera_recovery.sh script redirected mysqld's error log to a temporary file in order to find the start position. This, however, will not work if --log-error is configured for the server. Fixed by using --log-error in command line instead of redirection. [Patch contributed by Philippe MARASSE]
Diffstat (limited to 'scripts')
-rw-r--r--scripts/galera_recovery.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/galera_recovery.sh b/scripts/galera_recovery.sh
index 0e5a42b1676..d734ceb7ac7 100644
--- a/scripts/galera_recovery.sh
+++ b/scripts/galera_recovery.sh
@@ -68,7 +68,8 @@ parse_arguments() {
wsrep_recover_position() {
# Redirect server's error log to the log file.
- eval /usr/sbin/mysqld $cmdline_args --user=$user --wsrep_recover 2> "$log_file"
+ eval /usr/sbin/mysqld $cmdline_args --user=$user --wsrep_recover \
+ --log-error="$log_file"
ret=$?
if [ $ret -ne 0 ]; then
# Something went wrong, let us also print the error log so that it