summaryrefslogtreecommitdiff
path: root/storage/innobase/lock
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-12-02 19:30:50 +0530
committerSatya B <satya.bn@sun.com>2009-12-02 19:30:50 +0530
commitc6c12db965ec17f5bf7db20eaf668eede32e4e43 (patch)
tree20b44164d11355963bfee1938eef05d8f545cfcf /storage/innobase/lock
parent37360afb219a6864eb28e4beaf538c0838b6d8fe (diff)
parent3606e59cfefbc3f0ed64c45e55bd1289abb9bf64 (diff)
downloadmariadb-git-c6c12db965ec17f5bf7db20eaf668eede32e4e43.tar.gz
Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge.
Merging revisions 3221 to 3230 from mysql-5.1-bugteam
Diffstat (limited to 'storage/innobase/lock')
-rw-r--r--storage/innobase/lock/lock0lock.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
index 67b2eac7219..736198dc346 100644
--- a/storage/innobase/lock/lock0lock.c
+++ b/storage/innobase/lock/lock0lock.c
@@ -578,6 +578,23 @@ lock_sys_create(
}
/*********************************************************************//**
+Closes the lock system at database shutdown. */
+UNIV_INTERN
+void
+lock_sys_close(void)
+/*================*/
+{
+ if (lock_latest_err_file != NULL) {
+ fclose(lock_latest_err_file);
+ lock_latest_err_file = NULL;
+ }
+
+ hash_table_free(lock_sys->rec_hash);
+ mem_free(lock_sys);
+ lock_sys = NULL;
+}
+
+/*********************************************************************//**
Gets the size of a lock struct.
@return size in bytes */
UNIV_INTERN