diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 15:27:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 15:27:09 +0200 |
| commit | b3f4cf7c1325ff1ca771a44ae25616d80605e8e7 (patch) | |
| tree | dbd559f57db7ad20f9b9ecf1b4c2e143de32c986 /storage/xtradb/lock | |
| parent | a79d46c3a4839fa15c9f78dc2d5858ef948add18 (diff) | |
| parent | b42664e85e2cd512245de4fde94237a502fdbedb (diff) | |
| download | mariadb-git-b3f4cf7c1325ff1ca771a44ae25616d80605e8e7.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 0.0
Diffstat (limited to 'storage/xtradb/lock')
| -rw-r--r-- | storage/xtradb/lock/lock0lock.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc index 730527921de..0ac60587b9c 100644 --- a/storage/xtradb/lock/lock0lock.cc +++ b/storage/xtradb/lock/lock0lock.cc @@ -656,6 +656,17 @@ lock_sys_close(void) mutex_free(&lock_sys->mutex); mutex_free(&lock_sys->wait_mutex); + os_event_free(lock_sys->timeout_event); + + for (srv_slot_t* slot = lock_sys->waiting_threads; + slot < lock_sys->waiting_threads + OS_THREAD_MAX_N; slot++) { + + ut_ad(!slot->in_use); + ut_ad(!slot->thr); + if (slot->event != NULL) + os_event_free(slot->event); + } + mem_free(lock_stack); mem_free(lock_sys); |