From 29e2cbb9b2339627497fb3247942bd802ec81191 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 25 Feb 2023 09:47:39 +1100 Subject: [PATCH] clean up healthcheck.sh script --- 10.10/healthcheck.sh | 4 ++-- 10.11/healthcheck.sh | 4 ++-- 10.3/healthcheck.sh | 4 ++-- 10.4/healthcheck.sh | 4 ++-- 10.5/healthcheck.sh | 4 ++-- 10.6/healthcheck.sh | 4 ++-- 10.7/healthcheck.sh | 4 ++-- 10.8/healthcheck.sh | 4 ++-- 10.9/healthcheck.sh | 4 ++-- 11.0/healthcheck.sh | 4 ++-- healthcheck.sh | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/10.10/healthcheck.sh b/10.10/healthcheck.sh index bdc2011..1177fef 100755 --- a/10.10/healthcheck.sh +++ b/10.10/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mariadb/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mariadb -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.11/healthcheck.sh b/10.11/healthcheck.sh index bdc2011..1177fef 100755 --- a/10.11/healthcheck.sh +++ b/10.11/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mariadb/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mariadb -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.3/healthcheck.sh b/10.3/healthcheck.sh index d5e65a0..9ec1be3 100755 --- a/10.3/healthcheck.sh +++ b/10.3/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mysql/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mysql -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.4/healthcheck.sh b/10.4/healthcheck.sh index d5e65a0..9ec1be3 100755 --- a/10.4/healthcheck.sh +++ b/10.4/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mysql/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mysql -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.5/healthcheck.sh b/10.5/healthcheck.sh index d5e65a0..9ec1be3 100755 --- a/10.5/healthcheck.sh +++ b/10.5/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mysql/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mysql -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.6/healthcheck.sh b/10.6/healthcheck.sh index bdc2011..1177fef 100755 --- a/10.6/healthcheck.sh +++ b/10.6/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mariadb/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mariadb -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.7/healthcheck.sh b/10.7/healthcheck.sh index bdc2011..1177fef 100755 --- a/10.7/healthcheck.sh +++ b/10.7/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mariadb/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mariadb -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.8/healthcheck.sh b/10.8/healthcheck.sh index bdc2011..1177fef 100755 --- a/10.8/healthcheck.sh +++ b/10.8/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mariadb/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mariadb -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/10.9/healthcheck.sh b/10.9/healthcheck.sh index bdc2011..1177fef 100755 --- a/10.9/healthcheck.sh +++ b/10.9/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mariadb/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mariadb -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/11.0/healthcheck.sh b/11.0/healthcheck.sh index c1d1fad..96fc8f7 100755 --- a/11.0/healthcheck.sh +++ b/11.0/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mariadb/mariadb_upgrade_info +# Test the lock on the file $datadir/mariadb_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mariadb -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def diff --git a/healthcheck.sh b/healthcheck.sh index d5e65a0..9ec1be3 100755 --- a/healthcheck.sh +++ b/healthcheck.sh @@ -183,7 +183,7 @@ replication() # mariadbupgrade # -# Test the lock on the file /var/lib/mysql/mysql_upgrade_info +# Test the lock on the file $datadir/mysql_upgrade_info # https://jira.mariadb.org/browse/MDEV-27068 mariadbupgrade() { @@ -203,8 +203,8 @@ if [ $# -eq 0 ]; then exit 1 fi -# Marks the end of mysql -> mariadb name changes in 10.6+ #ENDOFSUBSTITUTIONS +# Marks the end of mysql -> mariadb name changes in 10.6+ # Global variables used by tests declare -A repl declare -A def