summaryrefslogtreecommitdiff
path: root/storage/innodb_plugin/fil
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2010-04-01 15:08:47 +0400
committerSergey Vojtovich <svoj@sun.com>2010-04-01 15:08:47 +0400
commit061edd2c2aa657b318d1a1b85c9c21207567f92e (patch)
treeb030bb3a8b388057beacf6e16ce1e084d709d79b /storage/innodb_plugin/fil
parent8939cb8655a416c417d2a48e435ce2b094562d0a (diff)
downloadmariadb-git-061edd2c2aa657b318d1a1b85c9c21207567f92e.tar.gz
Applying InnoDB snapshot
Detailed revision comments: r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded program and does not contain mutexes. This change allows InnoDB Hot Backup to be compiled with UNIV_DEBUG. Suggested by Michael Izioumtchenko.
Diffstat (limited to 'storage/innodb_plugin/fil')
-rw-r--r--storage/innodb_plugin/fil/fil0fil.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innodb_plugin/fil/fil0fil.c b/storage/innodb_plugin/fil/fil0fil.c
index b2593765af3..8819113f833 100644
--- a/storage/innodb_plugin/fil/fil0fil.c
+++ b/storage/innodb_plugin/fil/fil0fil.c
@@ -4786,8 +4786,10 @@ void
fil_close(void)
/*===========*/
{
+#ifndef UNIV_HOTBACKUP
/* The mutex should already have been freed. */
ut_ad(fil_system->mutex.magic_n == 0);
+#endif /* !UNIV_HOTBACKUP */
hash_table_free(fil_system->spaces);