diff options
| author | unknown <anozdrin/alik@booka.opbmk> | 2007-02-24 13:10:04 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@booka.opbmk> | 2007-02-24 13:10:04 +0300 |
| commit | 94d4f324eca7dade5c18fa3ed567a8f624e7e1ba (patch) | |
| tree | 9a2ef1c020ebc3ad6715220217962599e4cd27f1 | |
| parent | 37a5703bc7d815cd93a4c6deee2f8ad266784098 (diff) | |
| download | mariadb-git-94d4f324eca7dade5c18fa3ed567a8f624e7e1ba.tar.gz | |
Fix shutdown delay option name according to The Manual.
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a64808cfb87..a2460edec73 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2993,7 +2993,7 @@ language = $path_language character-sets-dir = $path_charsetsdir basedir = $path_my_basedir server_id = $server_id -shutdown_delay = 10 +shutdown-delay = 10 skip-stack-trace skip-innodb skip-ndbcluster diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index c816069c51e..f19700de64d 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -510,7 +510,7 @@ int Instance_options::add_option(const char* option) {"--pid-file=", 11, &mysqld_pid_file, SAVE_WHOLE_AND_ADD}, {"--mysqld-path=", 14, &mysqld_path, SAVE_VALUE}, {"--nonguarded", 9, &nonguarded, SAVE_WHOLE}, - {"--shutdown_delay", 9, &shutdown_delay, SAVE_VALUE}, + {"--shutdown-delay", 9, &shutdown_delay, SAVE_VALUE}, {NULL, 0, NULL, 0} }; struct selected_options_st *selected_options; |