diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-12-30 03:44:25 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-12-30 03:44:25 +0400 |
| commit | 4518b47aafa36342c15ff7a8063a2de1dc300f74 (patch) | |
| tree | e7156bee211c176097e6b7f757f85653affe1f14 /mysys/thr_lock.c | |
| parent | e3b62628e29047e1b1256f40cac4050d178e27a6 (diff) | |
| parent | 2b0c4476835c31f37b93aa96a905cdf1917766cd (diff) | |
| download | mariadb-git-4518b47aafa36342c15ff7a8063a2de1dc300f74.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
include/thr_lock.h:
Auto merged
myisam/mi_locking.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysys/thr_lock.c:
Auto merged
Diffstat (limited to 'mysys/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 27203c2d23c..3d29379a9fc 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -757,8 +757,16 @@ void thr_unlock(THR_LOCK_DATA *data) } else lock->write.last=data->prev; - if (lock_type >= TL_WRITE_CONCURRENT_INSERT && lock->update_status) - (*lock->update_status)(data->status_param); + if (lock_type >= TL_WRITE_CONCURRENT_INSERT) + { + if (lock->update_status) + (*lock->update_status)(data->status_param); + } + else + { + if (lock->restore_status) + (*lock->restore_status)(data->status_param); + } if (lock_type == TL_READ_NO_INSERT) lock->read_no_write_count--; data->type=TL_UNLOCK; /* Mark unlocked */ |