diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-29 20:26:33 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-29 20:26:33 +0300 |
| commit | 10d282f6321cf02b060ed489550b65c35f4bee58 (patch) | |
| tree | 3f4af5895e26720092bbc9a5f40873681337d97e /sql/slave.cc | |
| parent | 6e5952d087b8686242e28850ce958df0b00499d7 (diff) | |
| download | mariadb-git-10d282f6321cf02b060ed489550b65c35f4bee58.tar.gz | |
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
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 1 |
1 files changed, 0 insertions, 1 deletions
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) { |