Commit b99fbce5 authored by msvensson@pilot.blaudden's avatar msvensson@pilot.blaudden

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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents 5fdd4112 d343965f
...@@ -67,7 +67,8 @@ Thread_registry::~Thread_registry() ...@@ -67,7 +67,8 @@ Thread_registry::~Thread_registry()
if (head.next != &head) if (head.next != &head)
log_error("Not all threads died properly\n"); log_error("Not all threads died properly\n");
/* All threads must unregister */ /* All threads must unregister */
DBUG_ASSERT(head.next == &head); // Disabled assert temporarily - BUG#28030
// DBUG_ASSERT(head.next == &head);
pthread_mutex_unlock(&LOCK_thread_registry); pthread_mutex_unlock(&LOCK_thread_registry);
pthread_cond_destroy(&COND_thread_registry_is_empty); pthread_cond_destroy(&COND_thread_registry_is_empty);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment