MDEV-32361 iblogfile restore now built into mariadb-backup

2023-10-30 16:37:31 +11:00 · 2023-10-30 16:37:31 +11:00 · 6852b71f22
commit 6852b71f22
parent ed99cf3f3c
10 changed files with 0 additions and 40 deletions
--- a/10.10/docker-entrypoint.sh
+++ b/10.10/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/10.11/docker-entrypoint.sh
+++ b/10.11/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/10.4/docker-entrypoint.sh
+++ b/10.4/docker-entrypoint.sh
@ -495,10 +495,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/10.5/docker-entrypoint.sh
+++ b/10.5/docker-entrypoint.sh
@ -495,10 +495,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/10.6/docker-entrypoint.sh
+++ b/10.6/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/11.0/docker-entrypoint.sh
+++ b/11.0/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/11.1/docker-entrypoint.sh
+++ b/11.1/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/11.2/docker-entrypoint.sh
+++ b/11.2/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/11.3/docker-entrypoint.sh
+++ b/11.3/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -496,10 +496,6 @@ docker_mariadb_init()
 			mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back

 			mv "$DATADIR"/.restore/** "$DATADIR"/
-			# Waiting on MDEV-32361 fix
-			for iblogfile in "$DATADIR"/.init/iblogfile*; do
-				[ ! -f "${iblogfile/.init/}" ] && mv "$iblogfile" "$DATADIR"/
-			done
 			if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
 				mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
 				mysql_note "Adding startup configuration:"