1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

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
This commit is contained in:
unknown
2006-12-30 03:44:25 +04:00
5 changed files with 22 additions and 2 deletions

View File

@@ -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 */