bzr commit into mysql-6.0-falcon branch (svoj:2808)

[Sergey Vojtovich]

#At file:///home/svoj/devel/bzr-mysql/mysql-6.0-falcon-team-push/

 2808 Sergey Vojtovich	2008-09-03 [merge]
      Merge.
added:
  mysql-test/suite/falcon/r/falcon_bug_37668.result
  mysql-test/suite/falcon/t/falcon_bug_37668.test
modified:
  storage/falcon/StorageHandler.cpp
  storage/falcon/ha_falcon.cpp

per-file messages:
  mysql-test/suite/falcon/r/falcon_bug_37668.result
    Merge.
  mysql-test/suite/falcon/t/falcon_bug_37668.test
    Merge.
  storage/falcon/StorageHandler.cpp
    Merge.
  storage/falcon/ha_falcon.cpp
    Merge.
=== added file 'mysql-test/suite/falcon/r/falcon_bug_37668.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_37668.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_37668.result	2008-09-02 13:45:47 +0000
@@ -0,0 +1,2 @@
+CREATE TABLESPACE FALCON_MASTER ADD DATAFILE 'test.fts' ENGINE=Falcon;
+ERROR HY000: Tablespace 'FALCON_MASTER' already exists

=== added file 'mysql-test/suite/falcon/t/falcon_bug_37668.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_37668.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_37668.test	2008-09-02 13:45:47 +0000
@@ -0,0 +1,4 @@
+--source include/have_falcon.inc
+
+--error ER_TABLESPACE_EXIST
+CREATE TABLESPACE FALCON_MASTER ADD DATAFILE 'test.fts' ENGINE=Falcon;

=== modified file 'storage/falcon/StorageHandler.cpp'
--- a/storage/falcon/StorageHandler.cpp	2008-08-14 11:24:18 +0000
+++ b/storage/falcon/StorageHandler.cpp	2008-09-02 13:45:47 +0000
@@ -488,6 +488,13 @@ int StorageHandler::createTablespace(con
 	if (!dictionaryConnection)
 		return StorageErrorTablesSpaceOperationFailed;
 
+	if (   !strcasecmp(tableSpaceName, MASTER_NAME)
+		|| !strcasecmp(tableSpaceName, DEFAULT_TABLESPACE)
+		|| !strcasecmp(tableSpaceName, TEMPORARY_TABLESPACE))
+		{
+		return StorageErrorTableSpaceExist;
+		}
+
 	JString tableSpace = JString::upcase(tableSpaceName);
 
 	TableSpaceManager *tableSpaceManager = 

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-08-29 20:41:13 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-09-03 08:32:44 +0000
@@ -1261,6 +1261,8 @@ int StorageInterface::start_consistent_s
 {
 	DBUG_ENTER("StorageInterface::start_consistent_snapshot");
 	int ret = storageHandler->startTransaction(thd, TRANSACTION_CONSISTENT_READ);
+ 	if (!ret)
+		trans_register_ha(thd, true, hton);
 	DBUG_RETURN(ret);
 
 }