bk commit into 6.0 tree (svoj:1.2649) BUG#31296

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
6.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-30 14:11:16+04:00, svoj@stripped +3 -0
  BUG#31296 - falcon does not remove associated tablespace file.
  
  When dropping a tablespace, falcon doesn't clean-up data files and
  in-memory data structures.

  mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2007-10-30 14:11:14+04:00, svoj@stripped +4 -0
    A test case for BUG#31296.

  mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2007-10-30 14:11:14+04:00, svoj@stripped +0 -0

  mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2007-10-30 14:11:14+04:00, svoj@stripped +9 -0
    A test case for BUG#31296.

  mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2007-10-30 14:11:14+04:00, svoj@stripped +0 -0

  storage/falcon/TableSpaceManager.cpp@stripped, 2007-10-30 14:11:14+04:00, svoj@stripped +1 -0
    When dropping a table space, clean-up data files and table space hash
    as well.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_ts.result b/mysql-test/suite/falcon/r/falcon_ts.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_ts.result	2007-10-30 14:11:14 +04:00
@@ -0,0 +1,4 @@
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+DROP TABLESPACE ts1 ENGINE=falcon;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_ts.test b/mysql-test/suite/falcon/t/falcon_ts.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_ts.test	2007-10-30 14:11:14 +04:00
@@ -0,0 +1,9 @@
+--source include/have_falcon.inc
+
+#
+# BUG#31296 - falcon does not remove associated tablespace file.
+#
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+DROP TABLESPACE ts1 ENGINE=falcon;
diff -Nrup a/storage/falcon/TableSpaceManager.cpp b/storage/falcon/TableSpaceManager.cpp
--- a/storage/falcon/TableSpaceManager.cpp	2007-09-20 20:42:44 +05:00
+++ b/storage/falcon/TableSpaceManager.cpp	2007-10-30 14:11:14 +04:00
@@ -269,6 +269,7 @@ void TableSpaceManager::dropTableSpace(T
 	database->commitSystemTransaction();
 	sync.unlock();
 	tableSpace->active = false;
+        expungeTableSpace(tableSpace->tableSpaceId);
 }
 
 void TableSpaceManager::reportStatistics(void)