diff options
| author | svoj@mysql.com/april.(none) <> | 2006-12-30 03:44:25 +0400 |
|---|---|---|
| committer | svoj@mysql.com/april.(none) <> | 2006-12-30 03:44:25 +0400 |
| commit | bcbb50c1d2c1a04b57c012f8efadfeba9d789a15 (patch) | |
| tree | e7156bee211c176097e6b7f757f85653affe1f14 /mysys/thr_lock.c | |
| parent | 5344932e14e4e2cbd28d1def531a4fde79c726ee (diff) | |
| parent | 3cfd578ea7efa50805d2a069e6e180331ba41358 (diff) | |
| download | mariadb-git-bcbb50c1d2c1a04b57c012f8efadfeba9d789a15.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
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 */ |