bk commit into 6.0 tree (tsmith:1.2748) WL#4085

[tim]

Below is the list of changes that have just been committed into a local
6.0 repository of tsmith. When tsmith 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-12-07 15:11:49-07:00, tsmith@stripped +1 -0
  Explicitly ignore the 'skip-im' option, so it doesn't get passed
  through directly to mysqld.  WL#4085 "Discontinue the instance manager"

  mysql-test/mysql-test-run.pl@stripped, 2007-12-07 15:11:48-07:00, tsmith@stripped +1 -1
    Explicitly ignore the 'skip-im' option, so it doesn't get passed
    through directly to mysqld.  WL#4085 "Discontinue the instance manager"

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-12-07 15:06:12 -07:00
+++ b/mysql-test/mysql-test-run.pl	2007-12-07 15:11:48 -07:00
@@ -501,6 +501,7 @@ sub command_line_setup () {
   # Put the complete option string here.  For example, to remove the --suite
   # option, remove it from GetOptions() below and put 'suite|suites=s' here.
   my @removed_options = (
+    'skip-im',  # WL#4085 "Discontinue the instance manager"
   );
 
   Getopt::Long::Configure("pass_through");
@@ -4888,7 +4889,6 @@ Options to control what test suites or c
                         list of suite names.
                         The default is: "$opt_suites"
   skip-rpl              Skip the replication test cases.
-  skip-im               Don't start IM, and skip the IM test cases
   big-test              Set the environment variable BIG_TEST, which can be
                         checked from test cases.
   combination="ARG1 .. ARG2" Specify a set of "mysqld" arguments for one