summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@ibm.>2007-07-25 13:31:46 +0400
committerunknown <anozdrin/alik@ibm.>2007-07-25 13:31:46 +0400
commit5e0e5e5e3b6e63018e4e355c6c046357df19c546 (patch)
tree74034226368f5a0e6ec6a4b1b595d18989c2cdb2 /server-tools
parent3232f483a1d30f8ec6122a23747d1db1397b50f1 (diff)
downloadmariadb-git-5e0e5e5e3b6e63018e4e355c6c046357df19c546.tar.gz
Temporary enable IM tests in 5.1-runtime tree.
Enable assert in Thread_registry. mysql-test/t/disabled.def: Temporary enable IM tests in the team tree. server-tools/instance-manager/thread_registry.cc: Uncomment assert.
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/thread_registry.cc3
1 files changed, 1 insertions, 2 deletions
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);