Merge bk-internal:/home/bk/mysql-5.1-new

into  mysql.com:/home/jimw/my/mysql-5.1-clean

mysql-test/t/disabled.def

@@ -12,6 +12,7 @@
 events_bugs              : BUG#17619 2006-02-21 andrey  Test case unstable (race conditions)
 events_stress            : BUG#17619 2006-02-21 andrey  Test case unstable
 events                   : BUG#17619 2006-02-21 andrey  Test case unstable
+events_logs_tests        : BUG#18953 2006-04-12 kent    Test is randomly failing
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    Test fails randomly
@@ -21,6 +22,7 @@ ndb_gis                  : BUG#18600 2006-03-28 brian
 ndb_load                 : BUG#17233 2006-02-16 jmiller
 partition_03ndb          : BUG#16385 2006-03-24 mikael
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller Dbug assert in RBR mode when executing test suite
+rpl_deadlock_innodb      : BUG#16920 2006-04-12 kent    fails in show slave status (randomly)
 rpl_ndb_dd_basic         : BUG#18569 2006-03-28 brian
 rpl_row_basic_7ndb       : BUG#18923 2006-04-09 brian
 rpl_ndb_dd_advance       : BUG#18924 2006-04-09 brian

server-tools/instance-manager/options.cc

@@ -91,73 +91,80 @@ static struct my_option my_long_options[] =
   { "help", '?', "Display this help and exit.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
+  { "bind-address", OPT_BIND_ADDRESS, "Bind address to use for connection.",
+    (gptr *) &Options::bind_address, (gptr *) &Options::bind_address,
+    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+
 #ifndef DBUG_OFF
   {"debug", '#', "Debug log.",
    (gptr*) &Options::default_dbug_option, (gptr*) &Options::default_dbug_option,
    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #endif
 
+  { "default-mysqld-path", OPT_MYSQLD_PATH, "Where to look for MySQL"
+    " Server binary.",
+    (gptr *) &Options::default_mysqld_path,
+    (gptr *) &Options::default_mysqld_path,
+    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
+#ifdef __WIN__
+  { "install", OPT_INSTALL_SERVICE, "Install as system service.",
+    (gptr *) &Options::install_as_service, (gptr*) &Options::install_as_service,
+    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
+#endif
+
   { "log", OPT_LOG, "Path to log file. Used only with --run-as-service.",
     (gptr *) &Options::log_file_name, (gptr *) &Options::log_file_name,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "pid-file", OPT_PID_FILE, "Pid file to use.",
-    (gptr *) &Options::pid_file_name, (gptr *) &Options::pid_file_name,
-   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-
-  { "socket", OPT_SOCKET, "Socket file to use for connection.",
-    (gptr *) &Options::socket_file_name, (gptr *) &Options::socket_file_name,
-    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+  { "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
+    " instances in seconds.",
+    (gptr *) &Options::monitoring_interval,
+    (gptr *) &Options::monitoring_interval,
+    0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
+    0, 0, 0, 0, 0 },
 
   { "passwd", 'P', "Prepare entry for passwd file and exit.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "bind-address", OPT_BIND_ADDRESS, "Bind address to use for connection.",
-    (gptr *) &Options::bind_address, (gptr *) &Options::bind_address,
-    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-
-  { "port", OPT_PORT, "Port number to use for connections",
-    (gptr *) &Options::port_number, (gptr *) &Options::port_number,
-    0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
-
   { "password-file", OPT_PASSWORD_FILE, "Look for Instance Manager users"
                                         " and passwords here.",
     (gptr *) &Options::password_file_name,
     (gptr *) &Options::password_file_name,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 
-  { "default-mysqld-path", OPT_MYSQLD_PATH, "Where to look for MySQL"
-    " Server binary.",
-    (gptr *) &Options::default_mysqld_path,
-    (gptr *) &Options::default_mysqld_path,
-    0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
+  { "pid-file", OPT_PID_FILE, "Pid file to use.",
+    (gptr *) &Options::pid_file_name, (gptr *) &Options::pid_file_name,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+
+  { "port", OPT_PORT, "Port number to use for connections",
+    (gptr *) &Options::port_number, (gptr *) &Options::port_number,
+    0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
 
-  { "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
-    " instances in seconds.",
-    (gptr *) &Options::monitoring_interval,
-    (gptr *) &Options::monitoring_interval,
-    0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
-    0, 0, 0, 0, 0 },
 #ifdef __WIN__
-  { "install", OPT_INSTALL_SERVICE, "Install as system service.",
-    (gptr *) &Options::install_as_service, (gptr*) &Options::install_as_service,
-    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
   { "remove", OPT_REMOVE_SERVICE, "Remove system service.",
     (gptr *)&Options::remove_service, (gptr*) &Options::remove_service,
     0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
-  { "standalone", OPT_STAND_ALONE, "Run the application in stand alone mode.",
-    (gptr *)&Options::stand_alone, (gptr*) &Options::stand_alone,
-    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
 #else
   { "run-as-service", OPT_RUN_AS_SERVICE,
     "Daemonize and start angel process.", (gptr *) &Options::run_as_service,
     0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
+#endif
 
+  { "socket", OPT_SOCKET, "Socket file to use for connection.",
+    (gptr *) &Options::socket_file_name, (gptr *) &Options::socket_file_name,
+    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+
+#ifdef __WIN__
+  { "standalone", OPT_STAND_ALONE, "Run the application in stand alone mode.",
+    (gptr *)&Options::stand_alone, (gptr*) &Options::stand_alone,
+    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
+#else
   { "user", OPT_USER, "Username to start mysqlmanager",
     (gptr *) &Options::user,
     (gptr *) &Options::user,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
 #endif
+
   { "version", 'V', "Output version information and exit.", 0, 0, 0,
     GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },