From 6852b71f228e3d003dd7ce6db3627c5b10cfc1a0 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 30 Oct 2023 16:37:31 +1100 Subject: [PATCH] MDEV-32361 iblogfile restore now built into mariadb-backup --- 10.10/docker-entrypoint.sh | 4 ---- 10.11/docker-entrypoint.sh | 4 ---- 10.4/docker-entrypoint.sh | 4 ---- 10.5/docker-entrypoint.sh | 4 ---- 10.6/docker-entrypoint.sh | 4 ---- 11.0/docker-entrypoint.sh | 4 ---- 11.1/docker-entrypoint.sh | 4 ---- 11.2/docker-entrypoint.sh | 4 ---- 11.3/docker-entrypoint.sh | 4 ---- docker-entrypoint.sh | 4 ---- 10 files changed, 40 deletions(-) diff --git a/10.10/docker-entrypoint.sh b/10.10/docker-entrypoint.sh index 1f05e8f..4641970 100755 --- 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:" diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index 8b66427..c6ab435 100755 --- 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:" diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh index 7754695..b1cec6c 100755 --- 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:" diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index 31efc80..cd7cd08 100755 --- 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:" diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index 1f05e8f..4641970 100755 --- 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:" diff --git a/11.0/docker-entrypoint.sh b/11.0/docker-entrypoint.sh index 9594b3b..e4c319c 100755 --- 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:" diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh index 9594b3b..e4c319c 100755 --- 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:" diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh index 9594b3b..e4c319c 100755 --- 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:" diff --git a/11.3/docker-entrypoint.sh b/11.3/docker-entrypoint.sh index 9594b3b..e4c319c 100755 --- 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:" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 16b3df1..680dac9 100755 --- 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:"