diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2009-12-09 15:03:34 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2009-12-09 15:03:34 +0400 |
| commit | cda5ad508ae591c3d73c5316eb68e024e5ebd7c4 (patch) | |
| tree | 5732512e67d66255eba1c3b512ef545d714c9795 /storage/myisam/mi_locking.c | |
| parent | 6fd3866c6c104f8bc991d71583e627ae6fabe0ab (diff) | |
| parent | 6b8cd32eaa0e4bcbe2e5031cbb465f6a6036bc58 (diff) | |
| download | mariadb-git-cda5ad508ae591c3d73c5316eb68e024e5ebd7c4.tar.gz | |
Merge mysql-next-mr to mysql-next-mr-svoj.
Diffstat (limited to 'storage/myisam/mi_locking.c')
| -rw-r--r-- | storage/myisam/mi_locking.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c index dd33fb71910..bfe79f51e4e 100644 --- a/storage/myisam/mi_locking.c +++ b/storage/myisam/mi_locking.c @@ -45,6 +45,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) ++share->w_locks; ++share->tot_locks; info->lock_type= lock_type; + info->s->in_use= list_add(info->s->in_use, &info->in_use); DBUG_RETURN(0); } @@ -136,6 +137,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) } info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED); info->lock_type= F_UNLCK; + info->s->in_use= list_delete(info->s->in_use, &info->in_use); break; case F_RDLCK: if (info->lock_type == F_WRLCK) @@ -182,6 +184,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) share->r_locks++; share->tot_locks++; info->lock_type=lock_type; + info->s->in_use= list_add(info->s->in_use, &info->in_use); break; case F_WRLCK: if (info->lock_type == F_RDLCK) @@ -231,6 +234,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) info->invalidator=info->s->invalidator; share->w_locks++; share->tot_locks++; + info->s->in_use= list_add(info->s->in_use, &info->in_use); break; default: break; /* Impossible */ |