bzr commit into mysql-5.5-cluster-alter branch (Martin.Skold:3357)

[Martin Skold]

#At file:///home/marty/MySQL/mysql-5.5-telco-7.0/ based on revid:martin.skold@stripped

 3357 Martin Skold	2011-06-22
      Tablespace for memory tables is now allowed, changed test and regenerated result

    modified:
      mysql-test/suite/ndb/r/ndb_dd_ddl.result
      mysql-test/suite/ndb/t/ndb_dd_ddl.test
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_ddl.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_ddl.result	2011-01-21 14:27:30 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_ddl.result	2011-06-22 12:35:08 +0000
@@ -185,11 +185,7 @@ CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE MEMORY
 ENGINE NDB;
-ERROR HY000: Can't create table 'test.t1' (errno: 138)
-CREATE TABLE t1
-(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
-TABLESPACE ts1 STORAGE DISK
-ENGINE NDB;
+ALTER TABLE t1 STORAGE DISK;
 CREATE INDEX b_i on t1(b);
 CREATE INDEX bc_i on t1(b, c);
 DROP TABLE t1;

=== modified file 'mysql-test/suite/ndb/t/ndb_dd_ddl.test'
--- a/mysql-test/suite/ndb/t/ndb_dd_ddl.test	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dd_ddl.test	2011-06-22 12:35:08 +0000
@@ -270,17 +270,12 @@ ADD DATAFILE 'datafile2.dat'
 INITIAL_SIZE 1M
 ENGINE NDB;
 
---error 1005
 CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE MEMORY
 ENGINE NDB;
 
-CREATE TABLE t1
-(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
-TABLESPACE ts1 STORAGE DISK
-ENGINE NDB;
-
+ALTER TABLE t1 STORAGE DISK;
 
 CREATE INDEX b_i on t1(b);
 CREATE INDEX bc_i on t1(b, c);


Attachment: [text/bzr-bundle] bzr/[e-mail]