diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-26 19:32:28 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-26 19:32:28 +0400 |
| commit | 9bc32256427373e5bfa78f17c5854ac4e6a2fc31 (patch) | |
| tree | 748fd55866bcbc4de5eee1c078ac8d2cad5b6fd7 /mysys/thr_lock.c | |
| parent | 77b2f55f61a4e3ba642049a01651c92bfb0a7d9d (diff) | |
| parent | ca7cf69cb13285585922722063af888b957580ee (diff) | |
| download | mariadb-git-9bc32256427373e5bfa78f17c5854ac4e6a2fc31.tar.gz | |
Merge tag 'mariadb-10.2.6' into bb-10.2-ext
Diffstat (limited to 'mysys/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 11ac1189577..98a1fa784a4 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -1289,6 +1289,7 @@ thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_INFO *owner, DBUG_RETURN(THR_LOCK_SUCCESS); /* lock everything */ + DEBUG_SYNC_C("thr_multi_lock_before_thr_lock"); for (pos=data,end=data+count; pos < end ; pos++) { enum enum_thr_lock_result result= thr_lock(*pos, owner, lock_wait_timeout); @@ -1300,12 +1301,12 @@ thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_INFO *owner, (*pos)->type= TL_UNLOCK; DBUG_RETURN(result); } - DEBUG_SYNC_C("thr_multi_lock_after_thr_lock"); #ifdef MAIN printf("Thread: %s Got lock: 0x%lx type: %d\n",my_thread_name(), (long) pos[0]->lock, pos[0]->type); fflush(stdout); #endif } + DEBUG_SYNC_C("thr_multi_lock_after_thr_lock"); /* Call start_trans for all locks. |