Skip to content

Commit 56ef6d9

Browse files
grooverdangrooverdan
committed
Work around for --old-mode="" MDEV-30126
1 parent 6a881f0 commit 56ef6d9

File tree

12 files changed

+23
-13
lines changed

12 files changed

+23
-13
lines changed

‎.test/run.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ killoff
153153
;&
154154
mysql_random_password_is_complex)
155155

156-
echo -e "Test: MYSQL_RANDOM_ROOT_PASSWORD, needs to satisfy minimium complexity of simple-password-check plugin\n"
156+
echo -e "Test: MYSQL_RANDOM_ROOT_PASSWORD, needs to satisfy minimium complexity of simple-password-check plugin and old-mode=''\n"
157157

158-
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
158+
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 --old-mode=""
159159
pass=$(docker logs "$cid" | grep 'GENERATED ROOT PASSWORD' 2>&1)
160160
# trim up until passwod
161161
pass=${pass#*GENERATED ROOT PASSWORD: }

‎10.10/docker-entrypoint.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
195195
mariadb-install-db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197+
--old-mode='UTF8_IS_UTF8MB3' \
197198
--default-time-zone=SYSTEM --enforce-storage-engine= \
198199
--skip-log-bin \
199200
--expire-logs-days=0 \

‎10.11/docker-entrypoint.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
195195
mariadb-install-db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197+
--old-mode='UTF8_IS_UTF8MB3' \
197198
--default-time-zone=SYSTEM --enforce-storage-engine= \
198199
--skip-log-bin \
199200
--expire-logs-days=0 \

‎10.3/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
195195
mysql_install_db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197197
--default-time-zone=SYSTEM --enforce-storage-engine= \
198198
--skip-log-bin \
199199
--expire-logs-days=0 \

‎10.4/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
195195
mysql_install_db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197197
--default-time-zone=SYSTEM --enforce-storage-engine= \
198198
--skip-log-bin \
199199
--expire-logs-days=0 \

‎10.5/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
195195
mysql_install_db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197197
--default-time-zone=SYSTEM --enforce-storage-engine= \
198198
--skip-log-bin \
199199
--expire-logs-days=0 \

‎10.6/docker-entrypoint.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
195195
mariadb-install-db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197+
--old-mode='UTF8_IS_UTF8MB3' \
197198
--default-time-zone=SYSTEM --enforce-storage-engine= \
198199
--skip-log-bin \
199200
--expire-logs-days=0 \

‎10.7/docker-entrypoint.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
195195
mariadb-install-db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197+
--old-mode='UTF8_IS_UTF8MB3' \
197198
--default-time-zone=SYSTEM --enforce-storage-engine= \
198199
--skip-log-bin \
199200
--expire-logs-days=0 \

‎10.8/docker-entrypoint.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
195195
mariadb-install-db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197+
--old-mode='UTF8_IS_UTF8MB3' \
197198
--default-time-zone=SYSTEM --enforce-storage-engine= \
198199
--skip-log-bin \
199200
--expire-logs-days=0 \

‎10.9/docker-entrypoint.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ docker_init_database_dir() {
193193
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
194194
# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
195195
mariadb-install-db "${installArgs[@]}" "${@:2}" \
196-
--skip-test-db \
196+
--skip-test-db \
197+
--old-mode='UTF8_IS_UTF8MB3' \
197198
--default-time-zone=SYSTEM --enforce-storage-engine= \
198199
--skip-log-bin \
199200
--expire-logs-days=0 \

0 commit comments

Comments
 (0)