bk commit into 5.0 tree (anozdrin:1.2423)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-24 13:10:04+03:00, anozdrin@stripped +2 -0
  Fix shutdown delay option name according to The Manual.

  mysql-test/mysql-test-run.pl@stripped, 2007-02-24 13:09:58+03:00, anozdrin@stripped +1 -1
    Fix shutdown delay option name according to The Manual.

  server-tools/instance-manager/instance_options.cc@stripped, 2007-02-24 13:09:58+03:00, anozdrin@stripped +1 -1
    Fix shutdown delay option name according to The Manual.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	booka.opbmk
# Root:	/home/alik/Documents/MySQL/devel/5.0-rt-im

--- 1.198/mysql-test/mysql-test-run.pl	2007-02-23 21:51:31 +03:00
+++ 1.199/mysql-test/mysql-test-run.pl	2007-02-24 13:09:58 +03:00
@@ -2993,7 +2993,7 @@
 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

--- 1.33/server-tools/instance-manager/instance_options.cc	2006-12-23 22:04:23 +03:00
+++ 1.34/server-tools/instance-manager/instance_options.cc	2007-02-24 13:09:58 +03:00
@@ -510,7 +510,7 @@
     {"--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;