bk commit into 6.0 tree (svoj:1.2631) BUG#33211

[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, 2008-04-08 13:45:29+05:00, svoj@stripped +3 -0
  BUG#33211 - CREATE TEMPORARY TABLE ignores TABLESPACE argument under
              Falcon
  
  Falcon silently ignores TABLESPACE option when creating a temporary
  table.
  
  With this fix a warning is issued.

  mysql-test/suite/falcon/r/falcon_bug_33211.result@stripped, 2008-04-08 13:45:26+05:00, svoj@stripped +4 -0
    A test case for BUG#33211.

  mysql-test/suite/falcon/r/falcon_bug_33211.result@stripped, 2008-04-08 13:45:26+05:00, svoj@stripped +0 -0

  mysql-test/suite/falcon/t/falcon_bug_33211.test@stripped, 2008-04-08 13:45:26+05:00, svoj@stripped +8 -0
    A test case for BUG#33211.

  mysql-test/suite/falcon/t/falcon_bug_33211.test@stripped, 2008-04-08 13:45:26+05:00, svoj@stripped +0 -0

  storage/falcon/ha_falcon.cpp@stripped, 2008-04-08 13:45:26+05:00, svoj@stripped +5 -0
    Issue a warning if TABLESPACE option was specified for temporary
    table.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_33211.result b/mysql-test/suite/falcon/r/falcon_bug_33211.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_33211.result	2008-04-08 13:45:26 +05:00
@@ -0,0 +1,4 @@
+CREATE TEMPORARY TABLE t1(a INT) ENGINE=falcon TABLESPACE nosuchspace;
+Warnings:
+Warning	1478	TABLESPACE option is not supported for temporary tables. Switching to 'FALCON_TEMPORARY' tablespace.
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_33211.test b/mysql-test/suite/falcon/t/falcon_bug_33211.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_33211.test	2008-04-08 13:45:26 +05:00
@@ -0,0 +1,8 @@
+--source include/have_falcon.inc
+
+#
+# BUG#33211 - CREATE TEMPORARY TABLE ignores TABLESPACE argument under
+#             Falcon
+#
+CREATE TEMPORARY TABLE t1(a INT) ENGINE=falcon TABLESPACE nosuchspace;
+DROP TABLE t1;
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-04-06 03:09:14 +05:00
+++ b/storage/falcon/ha_falcon.cpp	2008-04-08 13:45:26 +05:00
@@ -813,7 +813,12 @@ int StorageInterface::create(const char 
 	const char *tableSpace = NULL;
 
 	if (tempTable)
+		{
+		if (info->tablespace)
+			push_warning_printf(mySqlThread, MYSQL_ERROR::WARN_LEVEL_WARN, ER_ILLEGAL_HA_CREATE_OPTION,
+				"TABLESPACE option is not supported for temporary tables. Switching to '%s' tablespace.", TEMPORARY_TABLESPACE);
 		tableSpace = TEMPORARY_TABLESPACE;
+		}
 	else if (info->tablespace)
 		tableSpace = info->tablespace;
 	else