diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 20:25:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 20:25:31 +0200 |
| commit | 867296c3edc4502093f7b706e7ac4c1670aa9515 (patch) | |
| tree | afcc8157b0b71a28edbcca6b862e6ca854fc743c /mysys | |
| parent | 0d5adca0de0a51b1f0bd49045fc4062eac7d1d25 (diff) | |
| parent | 6131d708e889cd4f93490c22bfee00d0728edfd2 (diff) | |
| download | mariadb-git-867296c3edc4502093f7b706e7ac4c1670aa9515.tar.gz | |
5.3 merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_lock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index e99956f9c8f..a7cbfa07db2 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -1168,6 +1168,9 @@ thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_INFO *owner, if (result != THR_LOCK_SUCCESS) { /* Aborted */ thr_multi_unlock(data,(uint) (pos-data), 0); + /* Mark all requested locks as TL_UNLOCK (to simplify lock checking) */ + for ( ; pos < end ; pos++) + (*pos)->type= TL_UNLOCK; DBUG_RETURN(result); } DEBUG_SYNC_C("thr_multi_lock_after_thr_lock"); |