Accepting request 1175223 from devel:BCI:Tumbleweed
🤖: sync package with devel:BCI:Tumbleweed from OBS OBS-URL: https://build.opensuse.org/request/show/1175223 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-image?expand=0&rev=12
This commit is contained in:
commit
fa9863329d
@ -228,7 +228,17 @@ docker_init_database_dir() {
|
|||||||
mysql_note "Initializing database files"
|
mysql_note "Initializing database files"
|
||||||
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
|
installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
|
||||||
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
|
||||||
mysql_install_db "${installArgs[@]}" "${@:2}" \
|
|
||||||
|
local mariadbdArgs=()
|
||||||
|
for arg in "${@:2}"; do
|
||||||
|
# Check if the argument contains whitespace
|
||||||
|
if [[ "$arg" =~ [[:space:]] ]]; then
|
||||||
|
mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
|
||||||
|
else
|
||||||
|
mariadbdArgs+=("$arg")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \
|
||||||
--skip-test-db \
|
--skip-test-db \
|
||||||
--old-mode='UTF8_IS_UTF8MB3' \
|
--old-mode='UTF8_IS_UTF8MB3' \
|
||||||
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
--default-time-zone=SYSTEM --enforce-storage-engine= \
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat May 18 17:56:27 UTC 2024 - Dan Čermák <dcermak@suse.com>
|
||||||
|
|
||||||
|
- Handle arguments with spaces in mysql_install_db
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 16 16:20:25 UTC 2024 - Dan Čermák <dcermak@suse.com>
|
Thu May 16 16:20:25 UTC 2024 - Dan Čermák <dcermak@suse.com>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user