From cfe910279144e64256589afc36fa0724fba0f845 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 12 Apr 2006 20:06:15 +0200 Subject: disabled.def: To somplify merge later, make files more similar in format --- mysql-test/t/disabled.def | 90 +++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index adec5dd95be..133ef9b3c8e 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -9,46 +9,50 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -events_bugs : test case unstable (race conditions). andrey will fix -events_stress : test case unstable. andrey will fix -events : test case unstable. andrey will fix -#ndb_alter_table_row : sometimes wrong error 1015!=1046 -ndb_autodiscover : Needs to be fixed w.r.t binlog -ndb_autodiscover2 : Needs to be fixed w.r.t binlog -#ndb_binlog_basic : Results are not deterministic, Tomas will fix -#ndb_binlog_multi : Results are not deterministic, Tomas will fix -ndb_cache2 : Bug #18597 -ndb_gis : Bug #18600 -ndb_load : Bug#17233 -partition_03ndb : Bug#16385 -ps_7ndb : dbug assert in RBR mode when executing test suite -#rpl_bit_npk : Bug#13418 -#rpl_ddl : Bug#15963 SBR does not show "Definer" correctly -rpl_ndb_dd_basic : Bug #18569 -rpl_ndb_2innodb : assertion in get_parts_for_update() -rpl_ndb_2myisam : assertion in get_parts_for_update() -rpl_ndb_auto_inc : Bug#17086 -rpl_ndb_basic : Bug #18592 -#rpl_ndb_blob : interferes with following tests, causing hang -#rpl_ndb_blob2 : interferes with following tests, causing hang -rpl_ndb_ddl : master hangs -#rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk fails -rpl_ndb_insert_ignore : Bug #18567 -rpl_ndb_innodb2ndb : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails -rpl_ndb_myisam2ndb : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails -rpl_ndb_multi_update3 : Bug#18627: Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit -rpl_ndb_log : result not deterministic, TBD if should remove -rpl_ndb_relay_space : Bug#16993 -#rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails -rpl_switch_stm_row_mixed : Bug #18590 -rpl_row_inexist_tbl : Disabled since patch makes this test wait forever -rpl_sp : Bug#16456 -rpl_until : Unstable test case, bug#15886 -sp-goto : GOTO is currently is disabled - will be fixed in the future -mysqldump : BUG#18078 -udf : Bug#18564 (Permission by Brian) -ndb_cache_multi2 : Bugs#18974: Test fails randomly -ndb_binlog_ddl_multi : Bugs#18976: Test fails randomly -rpl_ndb_trig004 : Bugs#18977: Test fails randomly -rpl_ndb_multi_update2 : Bugs#18978: Test fails randomly -rpl_row_blob_innodb : Bugs#18980: Test fails randomly +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 +ndb_cache2 : BUG#18597 2006-03-28 brian +ndb_cache_multi2 : BUG#18974 2006-04-10 kent Test fails randomly +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_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 +rpl_ndb_multi_update2 : BUG#18928 2006-04-09 brian +rpl_ndb_2innodb : BUG#18945 2006-03-22 tomas Assertion in get_parts_for_update() +rpl_ndb_2myisam : BUG#18945 2006-03-22 tomas Assertion in get_parts_for_update() +rpl_ndb_auto_inc : BUG#17086 2006-02-16 jmiller +rpl_ndb_basic : BUG#18592 2006-03-28 brian +rpl_ndb_ddl : BUG#18946 2006-03-16 mats Master hangs (Probably related to BUG#17400) +rpl_ndb_insert_ignore : BUG#18567 2006-03-28 brian +rpl_ndb_innodb2ndb : BUG#18261 2006-03-16 mats Cluster Replication: tests rpl_ndb_xxx2ndb fails (BUG#17400) +rpl_ndb_myisam2ndb : BUG#18261 2006-03-16 mats Cluster Replication: tests rpl_ndb_xxx2ndb fails (BUG#17400) +rpl_ndb_multi_update3 : BUG#18627 2006-03-29 monty Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit +rpl_ndb_log : BUG#18947 2006-03-21 tomas Result not deterministic, TBD if should remove +rpl_ndb_relay_space : BUG#16993 2006-02-16 jmiller +rpl_ndb_trig004 : BUG#18977 2006-04-10 kent Test fails randomly +rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian +rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly +rpl_row_inexist_tbl : BUG#18948 2006-03-09 mats Disabled since patch makes this test wait forever +rpl_sp : BUG#16456 2006-02-16 jmiller +rpl_until : BUG#15886 2006-02-16 jmiller Unstable test case +sp-goto : BUG#18949 2006-02-16 jmiller GOTO is currently is disabled - will be fixed in the future +mysqldump : BUG#18078 2006-03-10 lars +udf : BUG#18564 2006-03-27 ian (Permission by Brian) + +#ndb_alter_table_row : sometimes wrong error 1015!=1046 +#ndb_binlog_basic : Results are not deterministic, Tomas will fix +#ndb_binlog_multi : Results are not deterministic, Tomas will fix +#rpl_bit_npk : Bug#13418 +#rpl_ddl : Bug#15963 SBR does not show "Definer" correctly +#rpl_ndb_blob : interferes with following tests, causing hang +#rpl_ndb_blob2 : interferes with following tests, causing hang +#rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk fails +#rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails -- cgit v1.2.1 From dcf3ac77c7d5fb7886dd056f88b21d02406b0620 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 12 Apr 2006 20:38:08 +0200 Subject: disabled.def: Disabled 'rpl_deadlock_innodb', randomly failing --- mysql-test/t/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 133ef9b3c8e..b8162656d7b 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -22,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 -- cgit v1.2.1 From 9ac5b32a5fbb06e67c2762c4f50c917eb4e44887 Mon Sep 17 00:00:00 2001 From: "petr@mysql.com" <> Date: Wed, 12 Apr 2006 23:08:50 +0400 Subject: cleanup: sort IM options alphabetically --- server-tools/instance-manager/options.cc | 69 ++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index e7d366e7457..d3fada04577 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -88,40 +88,24 @@ 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 }, - { "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 }, - - { "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 }, +#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 }, { "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor" " instances in seconds.", @@ -129,26 +113,49 @@ static struct my_option my_long_options[] = (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 }, + + { "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 }, + + { "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 }, + #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 }, -- cgit v1.2.1