Fix some typos

2022-10-22 20:46:49 +02:00 · 2022-10-22 20:46:49 +02:00 · 45bb36b229
commit 45bb36b229
parent ee8996e7fd
19 changed files with 21 additions and 21 deletions
--- a/.test/run.sh
+++ b/.test/run.sh
@ -152,7 +152,7 @@ killoff
 	;&
 	mysql_random_password_is_complex)

-echo -e "Test: MYSQL_RANDOM_ROOT_PASSWORD, needs to satisify minimium complexity of simple-password-check plugin\n"
+echo -e "Test: MYSQL_RANDOM_ROOT_PASSWORD, needs to satisfy minimium complexity of simple-password-check plugin\n"

 runandwait -e MYSQL_RANDOM_ROOT_PASSWORD=1 -e MARIADB_MYSQL_LOCALHOST_USER=1 -e MARIADB_MYSQL_LOCALHOST_GRANTS="RELOAD, PROCESS, LOCK TABLES" "${image}" --plugin-load-add=simple_password_check
 pass=$(docker logs "$cid" | grep 'GENERATED ROOT PASSWORD' 2>&1)
@ -358,7 +358,7 @@ killoff
 	;&
 	mariadb_root_password_is_complex)

-echo -e "Test: MARIADB_RANDOM_ROOT_PASSWORD, needs to satisify minimium complexity of simple-password-check plugin\n"
+echo -e "Test: MARIADB_RANDOM_ROOT_PASSWORD, needs to satisfy minimium complexity of simple-password-check plugin\n"

 runandwait -e MARIADB_RANDOM_ROOT_PASSWORD=1 "${image}" --plugin-load-add=simple_password_check
 pass=$(docker logs "$cid"  2>&1 | grep 'GENERATED ROOT PASSWORD')
@ -465,7 +465,7 @@ fi
 	done

 	runandwait -e MARIADB_AUTO_UPGRADE=1 -v m57:/var/lib/mysql:Z "${image}"
-	
+
 	version=$(mariadbclient --skip-column-names -B -u root -pbob -e "SELECT VERSION()")

 	docker exec "$cid" ls -la /var/lib/mysql/system_mysql_backup_unknown_version.sql.zst || die "hopeing for backup file"
--- a/10.10/docker-entrypoint.sh
+++ b/10.10/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.10/healthcheck.sh
+++ b/10.10/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/10.3/docker-entrypoint.sh
+++ b/10.3/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.3/healthcheck.sh
+++ b/10.3/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/10.4/docker-entrypoint.sh
+++ b/10.4/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.4/healthcheck.sh
+++ b/10.4/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/10.5/docker-entrypoint.sh
+++ b/10.5/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.5/healthcheck.sh
+++ b/10.5/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/10.6/docker-entrypoint.sh
+++ b/10.6/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.6/healthcheck.sh
+++ b/10.6/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/10.7/docker-entrypoint.sh
+++ b/10.7/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.7/healthcheck.sh
+++ b/10.7/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/10.8/docker-entrypoint.sh
+++ b/10.8/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.8/healthcheck.sh
+++ b/10.8/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/10.9/docker-entrypoint.sh
+++ b/10.9/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/10.9/healthcheck.sh
+++ b/10.9/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -275,7 +275,7 @@ docker_setup_db() {
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
 		{
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatibility
 			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
 			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
 		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
--- a/healthcheck.sh
+++ b/healthcheck.sh
@ -222,7 +222,7 @@ _repl_param_check()
 		all)
 			if [ -n "${repl['name']}" ]; then
 				unset 'repl[name]'
-				echo "Option --replication_all incompatible with specied source --replication_name, clearing replication_name" >&2
+				echo "Option --replication_all incompatible with specified source --replication_name, clearing replication_name" >&2
 			fi
 			;;
 		name)