Skip to content

Commit

Permalink
MDEV-32361 iblogfile restore now built into mariadb-backup
Browse files Browse the repository at this point in the history
  • Loading branch information
@grooverdan
grooverdan committed Oct 30, 2023
1 parent ed99cf3 commit 6852b71
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 40 deletions.
4 changes: 0 additions & 4 deletions 10.10/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 10.11/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 10.4/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 10.5/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 10.6/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 11.0/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 11.1/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 11.2/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions 11.3/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 0 additions & 4 deletions docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down

0 comments on commit 6852b71

Please sign in to comment.