diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-06 09:32:13 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-06 09:32:13 +0100 |
| commit | 3bfd88d1d65d4f2fa13f84260fba22347538cdc0 (patch) | |
| tree | a05cd0e711f6ccb528490be82a8ae8b38de756d2 /scripts | |
| parent | 62b9be65422fc498356e122a7b9ca08f2ada9d0b (diff) | |
| download | mariadb-git-3bfd88d1d65d4f2fa13f84260fba22347538cdc0.tar.gz | |
MDEV-4068 rpm scriptlet chown command dangerous
add --mysqld option to my_print_defaults
change server-postin script to use that
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqldumpslow.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index b28e8a3ba1c..241cb84a399 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -257,7 +257,7 @@ fi # Now we can get arguments from the groups [mysqld] and [mysql_install_db] # in the my.cfg file, then re-run to merge with command line arguments. -parse_arguments `"$print_defaults" $defaults mysqld mariadb mysql_install_db client-server` +parse_arguments `"$print_defaults" $defaults --mysqld mysql_install_db` parse_arguments PICK-ARGS-FROM-ARGV "$@" # Configure paths to support files diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 81015746ae9..cd1b6fc18b7 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -237,7 +237,7 @@ sub defaults_for_group sub init_log { - foreach my $opt (defaults_for_group('mysqld mariadb')) + foreach my $opt (defaults_for_group('--mysqld')) { if ($opt =~ m/^--datadir=(.*)/ && -d "$1" && -w "$1") { diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 222279cc8ff..572a08781c8 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -503,7 +503,7 @@ append_arg_to_args () { args= SET_USER=2 -parse_arguments `$print_defaults $defaults --loose-verbose mysqld mariadb server client-server` +parse_arguments `$print_defaults $defaults --loose-verbose --mysqld` if test $SET_USER -eq 2 then SET_USER=0 diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh index 0de4fe159f0..c04ffad7457 100644 --- a/scripts/mysqldumpslow.sh +++ b/scripts/mysqldumpslow.sh @@ -53,7 +53,7 @@ GetOptions(\%opt, $opt{'help'} and usage(); unless (@ARGV) { - my $defaults = `my_print_defaults mysqld mariadb`; + my $defaults = `my_print_defaults --mysqld`; my $datadir = ($defaults =~ m/--datadir=(.*)/g)[-1]; if (!$datadir or $opt{i}) { |