diff options
| author | Michael Widenius <monty@mysql.com> | 2008-08-26 15:34:57 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-08-26 15:34:57 +0300 |
| commit | dd406c1e7ebeede6506c3f8c1bc62c671ea880a1 (patch) | |
| tree | 1a03eb79ca38addd300785022e9b7ec50a73bc96 /storage/maria/ma_close.c | |
| parent | 6629c7641a0e9a3987c7af7fe73ac2d48a56038a (diff) | |
| download | mariadb-git-dd406c1e7ebeede6506c3f8c1bc62c671ea880a1.tar.gz | |
Fix for Bug#36499 Maria: potential deadlock
This was done by introducing another mutex for handling the key_del link
I also renamed all key_del variables to start with key_del prefix
storage/maria/ma_close.c:
Rename of key_del variables
storage/maria/ma_key_recover.c:
Changed key_del to be protexted by it's own mutex: key_del_lock
Rename of key_del variables
Removed comment for old bug
storage/maria/ma_key_recover.h:
Rename of key_del variables
storage/maria/ma_open.c:
Initialization for new key_del_lock mutex
Renamed intern_cond to key_del_cond as it was only used for protection of key_del
storage/maria/ma_page.c:
Rename of key_del variables
storage/maria/ma_write.c:
Rename of key_del variables
storage/maria/maria_def.h:
Rename of key_del variables
Added key_del_lock
Diffstat (limited to 'storage/maria/ma_close.c')
| -rw-r--r-- | storage/maria/ma_close.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_close.c b/storage/maria/ma_close.c index 5f34b167dfb..266a095dd52 100644 --- a/storage/maria/ma_close.c +++ b/storage/maria/ma_close.c @@ -33,7 +33,7 @@ int maria_close(register MARIA_HA *info) (uint) share->tot_locks)); /* Check that we have unlocked key delete-links properly */ - DBUG_ASSERT(info->used_key_del == 0); + DBUG_ASSERT(info->key_del_used == 0); pthread_mutex_lock(&THR_LOCK_maria); if (info->lock_type == F_EXTRA_LCK) |