From 10d282f6321cf02b060ed489550b65c35f4bee58 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 29 Jun 2002 20:26:33 +0300 Subject: Added support for rw_tryrdlock() and rw_trywrlock() include/my_sys.h: Removed not needed macro (SAFE_MUTEX can handle this case better). sql/log.cc: Simple optimization sql/log_event.cc: Fix problem in LOAD DATA if table_name is NULL (unlikely event) sql/log_event.h: cleanup sql/slave.cc: remove unnecessary assert --- sql/slave.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index 5ca78b6c7a2..4b58816f409 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -405,7 +405,6 @@ int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock, */ struct timespec abstime; set_timespec(abstime,2); - DBUG_ASSERT_LOCK(cond_lock); pthread_cond_timedwait(term_cond, cond_lock, &abstime); if (*slave_running) { -- cgit v1.2.1