database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-07-18 16:25:33 +02:00
parent e644e130b0 9dafde575f
commit 9af2caca33
131 changed files with 2812 additions and 1854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mysql_secure_installation.sh
View File

@@ -27,6 +27,7 @@ echo_c=
basedir=
defaults_file=
defaults_extra_file=
defaults_group_suffix=
no_defaults=
parse_arg()
@@ -52,6 +53,7 @@ parse_arguments()
--basedir=*) basedir=`parse_arg "$arg"` ;;
--defaults-file=*) defaults_file="$arg" ;;
--defaults-extra-file=*) defaults_extra_file="$arg" ;;
--defaults-group-suffix=*) defaults_group_suffix="$arg" ;;
--no-defaults) no_defaults="$arg" ;;
*)
if test -n "$pick_args"
@@ -184,7 +186,7 @@ fi
# Now we can get arguments from the group [client] and [client-server]
# in the my.cfg file, then re-run to merge with command line arguments.
parse_arguments `$print_defaults $defaults_file $defaults_extra_file $no_defaults client client-server client-mariadb`
parse_arguments `$print_defaults $defaults_file $defaults_extra_file $defaults_group_suffix $no_defaults client client-server client-mariadb`
parse_arguments PICK-ARGS-FROM-ARGV "$@"
set_echo_compat() {