bzr push into mysql-trunk-cluster branch (Martin.Skold:3501 to 3502) Bug#13804744

[Martin Skold]

 3502 Martin Skold	2012-06-11
      Bug#13804744 INCONSAISTENT REQUIREMENT OF ENGINE= CLAUSE WHEN DEFAULT STORAGE_ENGINE IS USED: Added test case

    modified:
      mysql-test/suite/ndb/r/ndb_dd_ddl.result
      mysql-test/suite/ndb/t/ndb_dd_ddl.test
 3501 magnus.blaudd@stripped	2012-06-08
      ndb
       - revert MCP for propagating ALTER_COLUMN_ORDER which is already detected
         by comparing the old and new index for a column

    modified:
      sql/sql_table.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_ddl.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_ddl.result	2011-06-22 12:35:08 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_ddl.result	2012-06-11 07:42:26 +0000
@@ -88,6 +88,23 @@ ENGINE=NDB;
 DROP LOGFILE GROUP lg1 
 ENGINE=NDB;
 ERROR HY000: Failed to drop LOGFILE GROUP
+SET DEFAULT_STORAGE_ENGINE=NDB;
+CREATE LOGFILE GROUP lgx
+ADD UNDOFILE 'undofile.dat'
+INITIAL_SIZE 1M
+UNDO_BUFFER_SIZE = 1M;
+ALTER LOGFILE GROUP lgx
+ADD UNDOFILE 'undofile02.dat'
+INITIAL_SIZE=1M;
+CREATE TABLESPACE tsx
+ADD DATAFILE 'datafile.dat'
+USE LOGFILE GROUP lgx
+INITIAL_SIZE=1M;
+ALTER TABLESPACE tsx
+DROP DATAFILE 'datafile.dat'
+INITIAL_SIZE=1M;
+DROP TABLESPACE tsx;
+DROP LOGFILE GROUP lgx;
 DROP DATABASE IF EXISTS mysqltest;
 **** End Duplicate Statement Testing ****
 

=== modified file 'mysql-test/suite/ndb/t/ndb_dd_ddl.test'
--- a/mysql-test/suite/ndb/t/ndb_dd_ddl.test	2011-06-22 12:35:08 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dd_ddl.test	2012-06-11 07:42:26 +0000
@@ -145,6 +145,34 @@ ENGINE=NDB;
 DROP LOGFILE GROUP lg1 
 ENGINE=NDB;
 
+#
+# Bug#13804744 INCONSISTENT REQUIREMENT OF ENGINE= CLAUSE WHEN DEFAULT STORAGE_ENGINE IS USED
+#
+
+SET DEFAULT_STORAGE_ENGINE=NDB;
+
+CREATE LOGFILE GROUP lgx
+ADD UNDOFILE 'undofile.dat'
+INITIAL_SIZE 1M
+UNDO_BUFFER_SIZE = 1M;
+
+ALTER LOGFILE GROUP lgx
+ADD UNDOFILE 'undofile02.dat'
+INITIAL_SIZE=1M;
+
+CREATE TABLESPACE tsx
+ADD DATAFILE 'datafile.dat'
+USE LOGFILE GROUP lgx
+INITIAL_SIZE=1M;
+
+ALTER TABLESPACE tsx
+DROP DATAFILE 'datafile.dat'
+INITIAL_SIZE=1M;
+
+DROP TABLESPACE tsx;
+
+DROP LOGFILE GROUP lgx;
+
 DROP DATABASE IF EXISTS mysqltest;
 
 --echo **** End Duplicate Statement Testing ****

No bundle (reason: useless for push emails).