diff options
| -rw-r--r-- | mysql-test/t/disabled.def | 20 | ||||
| -rw-r--r-- | server-tools/instance-manager/thread_registry.cc | 3 |
2 files changed, 13 insertions, 10 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 07c5b4d56a3..b41875fe740 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -11,14 +11,18 @@ ############################################################################## user_limits : Bug#23921 random failure of user_limits.test -im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly -im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly -im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly -im_utils : Bug#20294 2007-05-30 alik Instance manager tests fail randomly -im_instance_conf : Bug#20294 2007-05-30 alik Instance manager tests fail randomly -im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance. -im_instance_conf : BUG#28743 Instance manager generates warnings in test suite -im_utils : BUG#28743 Instance manager generates warnings in test suite +# +# Temporary enable IM tests to catch the assert. +# +# im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly +# im_daemon_life_cycle : Bug#20294 2007-05-14 alik Instance manager tests fail randomly +# im_cmd_line : Bug#20294 2007-05-14 alik Instance manager tests fail randomly +# im_utils : Bug#20294 2007-05-30 alik Instance manager tests fail randomly +# im_instance_conf : Bug#20294 2007-05-30 alik Instance manager tests fail randomly +# im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance. +# im_instance_conf : BUG#28743 Instance manager generates warnings in test suite +# im_utils : BUG#28743 Instance manager generates warnings in test suite + concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper diff --git a/server-tools/instance-manager/thread_registry.cc b/server-tools/instance-manager/thread_registry.cc index b06c1240d92..700ed22afe7 100644 --- a/server-tools/instance-manager/thread_registry.cc +++ b/server-tools/instance-manager/thread_registry.cc @@ -67,8 +67,7 @@ Thread_registry::~Thread_registry() if (head.next != &head) log_error("Not all threads died properly\n"); /* All threads must unregister */ - // Disabled assert temporarily - BUG#28030 - // DBUG_ASSERT(head.next == &head); + DBUG_ASSERT(head.next == &head); pthread_mutex_unlock(&LOCK_thread_registry); pthread_cond_destroy(&COND_thread_registry_is_empty); |