bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3224 to 3226)

[Magnus Blåudd]

 3226 Magnus Blåudd	2011-03-04
      ndb
       - remove disabled.def listing and fix result file for ndb_dd_basic, ndb_dd_dump and ndb_dd_sql_features

    modified:
      mysql-test/suite/ndb/r/ndb_dd_basic.result
      mysql-test/suite/ndb/t/disabled.def
 3225 Magnus Blåudd	2011-03-04
      nbd
       - remove I_S.COLUMNS queries in test since 5.5 has no storage or format
         field.
       - update .result file
       - remove from disabled.def

    modified:
      mysql-test/suite/ndb/r/ndb_column_properties.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_column_properties.test
 3224 Magnus Blåudd	2011-03-04
      ndb
       - (re)add support for opening an old table where the tablespace
         was not saved in .frm file and instead should be read from engine

    modified:
      mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
      mysql-test/suite/ndb/t/ndb_dd_restore_compat.test
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_column_properties.result'
--- a/mysql-test/suite/ndb/r/ndb_column_properties.result	2009-08-22 19:53:23 +0000
+++ b/mysql-test/suite/ndb/r/ndb_column_properties.result	2011-03-04 14:01:38 +0000
@@ -12,10 +12,6 @@ ENGINE NDB;
 create table t1 (a int column_format DYNAMIC STORAGE DISK) TABLESPACE ts1 engine NDB;
 Warnings:
 Warning	1478	DYNAMIC column a with STORAGE DISK is not supported, column will become FIXED
-select column_name, storage, format from information_schema.columns
-where table_name = "t1";
-column_name	storage	format
-a	Disk	Dynamic
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -64,21 +60,6 @@ t1	CREATE TABLE `t1` (
   `f1` char(100) NOT NULL /*!50120 STORAGE DISK */ /*!50120 COLUMN_FORMAT DYNAMIC */,
   KEY `b` (`b`)
 ) /*!50100 TABLESPACE ts1 */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
-select column_name, storage, format from information_schema.columns
-where table_name = "t1";
-column_name	storage	format
-a	Default	Fixed
-a1	Default	Fixed
-b	Default	Dynamic
-b1	Disk	Fixed
-c	Default	Fixed
-c1	Memory	Dynamic
-d	Default	Fixed
-d1	Default	Dynamic
-e	Default	Fixed
-e1	Default	Dynamic
-f	Default	Fixed
-f1	Disk	Dynamic
 alter table t1 change column a a int storage disk;
 Warnings:
 Warning	1478	DYNAMIC column f1 with STORAGE DISK is not supported, column will become FIXED

=== modified file 'mysql-test/suite/ndb/r/ndb_dd_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_basic.result	2011-02-01 14:58:18 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result	2011-03-04 14:13:43 +0000
@@ -8,20 +8,20 @@ INITIAL_SIZE 16M
 UNDO_BUFFER_SIZE = 1M
 ENGINE=MYISAM;
 Warnings:
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 ALTER LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile02.dat'
 INITIAL_SIZE = 4M 
 ENGINE=XYZ;
 Warnings:
-Warning	1286	Unknown table engine 'XYZ'
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Warning	1286	Unknown storage engine 'XYZ'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'
 USE LOGFILE GROUP lg1
 INITIAL_SIZE 12M;
 Warnings:
-Error	1478	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+Warning	1478	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'
 INITIAL_SIZE 5K

=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2011-02-07 13:36:01 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2011-03-04 14:13:43 +0000
@@ -26,12 +26,8 @@ ndb_update_no_read	 : SEAGULL rbwr
 
 ndb_condition_pushdown	 : SEAGULL
 
-ndb_column_properties	 : SEAGULL tablespace
-ndb_dd_basic		 : SEAGULL tablespace
-ndb_dd_dump		 : SEAGULL tablespace
-ndb_dd_sql_features	 : SEAGULL tablespace
-ndb_dd_disk2memory	 : SEAGULL tablespace
-ndb_dd_alter		 : SEAGULL tablespace
+ndb_dd_disk2memory	 : SEAGULL alter
+ndb_dd_alter		 : SEAGULL alter
 
 ndb_index_ordered	 : SEAGULL alter in second connection deadlocks
 

=== modified file 'mysql-test/suite/ndb/t/ndb_column_properties.test'
--- a/mysql-test/suite/ndb/t/ndb_column_properties.test	2009-08-22 19:53:23 +0000
+++ b/mysql-test/suite/ndb/t/ndb_column_properties.test	2011-03-04 14:01:38 +0000
@@ -17,8 +17,8 @@ INITIAL_SIZE 6M
 ENGINE NDB;
 
 create table t1 (a int column_format DYNAMIC STORAGE DISK) TABLESPACE ts1 engine NDB;
-select column_name, storage, format from information_schema.columns
-where table_name = "t1";
+#select column_name, storage, format from information_schema.columns
+#where table_name = "t1";
 show create table t1;
 source show_attributes.inc;
 drop table t1;
@@ -42,8 +42,8 @@ insert into t1 (b, b1, d,d1,f,f1) values
 (3,3,"3","3","3","3");
 alter table t1 change column a a int column_format FIXED;
 show create table t1;
-select column_name, storage, format from information_schema.columns
-where table_name = "t1";
+#select column_name, storage, format from information_schema.columns
+#where table_name = "t1";
 alter table t1 change column a a int storage disk;
 show create table t1;
 source show_attributes.inc;

No bundle (reason: useless for push emails).