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.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-07-20 08:16:24 +02:00
parent 0f6f1114d4 a938503cfb
commit 0fe39d368a
362 changed files with 7658 additions and 3804 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() {

7
scripts/mytop.sh
View File

@@ -147,7 +147,12 @@ if (-e $config)
if (/(\S+)\s*=\s*(.*\S)/)
{
$config{lc $1} = $2 if exists $config{lc $1};
my ($k, $v) = ($1, $2);
if ($k =~ /^filter_/i) {
$config{lc $k} = StringOrRegex($v) if exists $config{lc $k};
} else {
$config{lc $k} = $v if exists $config{lc $k};
}
}
}
close CFG;