bzr push into mysql-6.0-falcon branch (vvaintroub:2770) Bug#38594

[Vladislav Vaintroub]

 2770 Vladislav Vaintroub	2008-08-07 [merge]
      merge
modified:
  storage/falcon/MemMgr.cpp
  storage/falcon/MemMgr.h

=== modified file 'storage/falcon/StorageHandler.cpp'
--- a/storage/falcon/StorageHandler.cpp	2008-07-31 08:52:32 +0000
+++ b/storage/falcon/StorageHandler.cpp	2008-08-07 18:18:29 +0000
@@ -488,7 +488,7 @@ int StorageHandler::createTablespace(con
 	TableSpaceManager *tableSpaceManager = 
 		dictionaryConnection->database->tableSpaceManager;
 
-	if (!tableSpaceManager->waitForPendingDrop(tableSpaceName, 10))
+	if (!tableSpaceManager->waitForPendingDrop(filename, 10))
 		// file still exists after waiting for 10 seconds
 		return  StorageErrorTableSpaceExist;