diff options
| author | unknown <rafal@quant.(none)> | 2007-03-01 11:52:20 +0100 |
|---|---|---|
| committer | unknown <rafal@quant.(none)> | 2007-03-01 11:52:20 +0100 |
| commit | bf9521d24bd9fd5228d52642fd16abd3830c2d09 (patch) | |
| tree | 25d196a7f4c66f95be396988523c975cafd78a8f /sql/slave.cc | |
| parent | b3c7224c3b82a3cbe0661c59ceabb9b7343d0319 (diff) | |
| download | mariadb-git-bf9521d24bd9fd5228d52642fd16abd3830c2d09.tar.gz | |
Fixing manual merge error.
sql/slave.cc:
Removing piece of code which get there when manual merging from 5.0 tree.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index bb2aa11626e..bede185f4c1 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2460,13 +2460,6 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ THD_CHECK_SENTRY(thd); delete thd; pthread_mutex_unlock(&LOCK_thread_count); -#ifndef DBUG_OFF - /* - Bug #19938 Valgrind error (race) in handle_slave_sql() - Read the value of rli->event_till_abort before releasing the mutex - */ - const int eta= rli->events_till_abort; -#endif /* Note: the order of the broadcast and unlock calls below (first broadcast, then unlock) is important. Otherwise a killer_thread can execute between the calls and |