bk commit into 6.0 tree (svoj:1.2657) BUG#31295

[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-11-02 14:13:47+04:00, svoj@stripped +2 -0
  BUG#31295 - NULL alter table operation causes falcon table to lose it's
              tablespace assoc.
  
  Added a test case to document that the problem is not repeatable
  anymore.

  mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2007-11-02 14:13:45+04:00,
svoj@stripped +15 -0
    A test case for BUG#31295.

  mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2007-11-02 14:13:45+04:00, svoj@stripped
+14 -0
    A test case for BUG#31295.

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	2007-11-01 15:27:55 +04:00
+++ b/mysql-test/suite/falcon/r/falcon_ts.result	2007-11-02 14:13:45 +04:00
@@ -8,3 +8,18 @@ CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.
 DROP TABLESPACE ts1 ENGINE=falcon;
 CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
 DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+CREATE TABLE t1(a INT) ENGINE=falcon;
+SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+TABLESPACE
+FALCON_USER
+ALTER TABLE t1 TABLESPACE ts1 ENGINE=falcon;
+SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+TABLESPACE
+TS1
+ALTER TABLE t1 ENGINE=falcon;
+SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+TABLESPACE
+TS1
+DROP TABLE t1;
+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
--- a/mysql-test/suite/falcon/t/falcon_ts.test	2007-11-01 15:27:55 +04:00
+++ b/mysql-test/suite/falcon/t/falcon_ts.test	2007-11-02 14:13:45 +04:00
@@ -22,3 +22,17 @@ CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.
 DROP TABLESPACE ts1 ENGINE=falcon;
 CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
 DROP TABLESPACE ts1 ENGINE=falcon;
+
+#
+# BUG#31295 - NULL alter table operation causes falcon table to lose it's
+#             tablespace assoc.
+#
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+CREATE TABLE t1(a INT) ENGINE=falcon;
+SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+ALTER TABLE t1 TABLESPACE ts1 ENGINE=falcon;
+SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+ALTER TABLE t1 ENGINE=falcon;
+SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+DROP TABLE t1;
+DROP TABLESPACE ts1 ENGINE=falcon;