database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.6' into '10.11'

Browse Source
This commit is contained in:
Julius Goryavsky
2024-09-02 03:42:02 +02:00
parent 984606d747 a50a5e0f3b
commit d058be62b8
51 changed files with 680 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/galera_recovery.sh
View File

@@ -81,10 +81,10 @@ wsrep_recover_position() {
# Parse server's error log for recovered position. The server prints
# "..skipping position recovery.." if started without wsrep.
recovered_pos="$(grep 'WSREP: Recovered position:' $log_file)"
recovered_pos="$(grep -a 'WSREP: Recovered position:' $log_file)"
if [ -z "$recovered_pos" ]; then
skipped="$(grep WSREP $log_file | grep 'skipping position recovery')"
skipped="$(grep -a WSREP $log_file | grep 'skipping position recovery')"
if [ -z "$skipped" ]; then
log "WSREP: Failed to recover position: '`cat $log_file`'"
exit 1

4
scripts/mysqld_safe.sh
View File

@@ -260,9 +260,9 @@ wsrep_recover_position() {
exit 1
fi
local rp="$(grep 'WSREP: Recovered position:' $wr_logfile)"
local rp="$(grep -a 'WSREP: Recovered position:' $wr_logfile)"
if [ -z "$rp" ]; then
local skipped="$(grep WSREP $wr_logfile | grep 'skipping position recovery')"
local skipped="$(grep -a WSREP $wr_logfile | grep 'skipping position recovery')"
if [ -z "$skipped" ]; then
log_error "WSREP: Failed to recover position: '`cat $wr_logfile`'"
ret=1