bk commit into 6.0 tree (svoj:1.2787) BUG#32617

[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-01-23 17:01:26+04:00, svoj@stripped +2 -0
  BUG#32617 - Falcon fails to create table with the same name after
              unsuccessfull create table
  
  Added a test case to document that the problem is not repeatable
  anymore.

  mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2008-01-23 17:01:24+04:00, svoj@stripped +9 -0
    A test case for BUG#32617.

  mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2008-01-23 17:01:25+04:00, svoj@stripped +10 -0
    A test case for BUG#32617.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_ts.result b/mysql-test/suite/falcon/r/falcon_ts.result
--- a/mysql-test/suite/falcon/r/falcon_ts.result	2008-01-22 20:59:20 +04:00
+++ b/mysql-test/suite/falcon/r/falcon_ts.result	2008-01-23 17:01:24 +04:00
@@ -36,3 +36,12 @@ DROP TABLE t1;
 DROP TABLESPACE `ts 1` ENGINE=falcon;
 DROP TABLESPACE ts1 ENGINE=falcon;
 ERROR HY000: Tablespace 'ts1' doesn't exist
+CREATE TABLE t1(a INT) ENGINE=falcon TABLESPACE ts1;
+ERROR HY000: Can't create table 'test.t1' (errno: 156)
+CREATE TABLE t1(a INT) ENGINE=falcon;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=Falcon DEFAULT CHARSET=latin1
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_ts.test b/mysql-test/suite/falcon/t/falcon_ts.test
--- a/mysql-test/suite/falcon/t/falcon_ts.test	2008-01-22 20:59:20 +04:00
+++ b/mysql-test/suite/falcon/t/falcon_ts.test	2008-01-23 17:01:25 +04:00
@@ -58,3 +58,13 @@ DROP TABLESPACE `ts 1` ENGINE=falcon;
 #
 --error ER_NO_SUCH_TABLESPACE
 DROP TABLESPACE ts1 ENGINE=falcon;
+
+#
+# BUG#32617 - Falcon fails to create table with the same name after
+#             unsuccessfull create table
+#
+--error 1005
+CREATE TABLE t1(a INT) ENGINE=falcon TABLESPACE ts1;
+CREATE TABLE t1(a INT) ENGINE=falcon;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;