1berry/mariadb-docker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-32361 iblogfile restore now built into mariadb-backup

Browse Source
This commit is contained in:
Daniel Black 2023-10-30 16:37:31 +11:00
parent ed99cf3f3c
commit 6852b71f22
10 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
10.10/docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
10.11/docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
10.4/docker-entrypoint.sh
View File

@ -495,10 +495,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
10.5/docker-entrypoint.sh
View File

@ -495,10 +495,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
10.6/docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
11.0/docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
11.1/docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
11.2/docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
11.3/docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"

4
docker-entrypoint.sh
View File

@ -496,10 +496,6 @@ docker_mariadb_init()
mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back mariadb-backup --target-dir="$DATADIR"/.init --datadir="$DATADIR"/.restore --move-back
mv "$DATADIR"/.restore/** "$DATADIR"/ 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 if [ -f "$DATADIR/.init/backup-my.cnf" ]; then
mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf" mv "$DATADIR/.init/backup-my.cnf" "$DATADIR/.my.cnf"
mysql_note "Adding startup configuration:" mysql_note "Adding startup configuration:"