bk commit into 5.1 tree (holyfoot:1.2641)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-12 14:26:09+04:00, holyfoot@stripped +4 -0
  'no innodb engine' test failure fixed

  mysql-test/r/partition.result@stripped, 2007-11-12 14:26:07+04:00, holyfoot@stripped +0 -14
    test result fixed

  mysql-test/r/partition_innodb.result@stripped, 2007-11-12 14:26:07+04:00, holyfoot@stripped +12 -0
    test result fixed

  mysql-test/t/partition.test@stripped, 2007-11-12 14:26:07+04:00, holyfoot@stripped +0 -11
    test moved to partition_innodb

  mysql-test/t/partition_innodb.test@stripped, 2007-11-12 14:26:07+04:00, holyfoot@stripped +11 -0
    test moved from partition.test

diff -Nrup a/mysql-test/r/partition.result b/mysql-test/r/partition.result
--- a/mysql-test/r/partition.result	2007-10-31 16:01:26 +04:00
+++ b/mysql-test/r/partition.result	2007-11-12 14:26:07 +04:00
@@ -1291,18 +1291,4 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (b) (PARTITION p1 VALUES LESS THAN (10) ENGINE = MyISAM, PARTITION p2 VALUES LESS THAN (20) ENGINE = MyISAM) */
 drop table t1, t2;
-create table t1 (int_column int, char_column char(5))
-PARTITION BY RANGE (int_column) subpartition by key (char_column)
-(PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
-Warnings:
-Warning	1286	Unknown table engine 'InnoDB'
-alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
-(PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `int_column` int(11) DEFAULT NULL,
-  `char_column` char(5) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (int_column) SUBPARTITION BY KEY (char_column) (PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
-drop table t1;
 End of 5.1 tests
diff -Nrup a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result
--- a/mysql-test/r/partition_innodb.result	2007-09-13 18:33:37 +05:00
+++ b/mysql-test/r/partition_innodb.result	2007-11-12 14:26:07 +04:00
@@ -136,3 +136,15 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 2
 DROP TABLE t1;
+create table t1 (int_column int, char_column char(5))
+PARTITION BY RANGE (int_column) subpartition by key (char_column)
+(PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
+alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
+(PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `int_column` int(11) DEFAULT NULL,
+  `char_column` char(5) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (int_column) SUBPARTITION BY KEY (char_column) (PARTITION p1 VALUES LESS THAN (5) ENGINE = MyISAM) */
+drop table t1;
diff -Nrup a/mysql-test/t/partition.test b/mysql-test/t/partition.test
--- a/mysql-test/t/partition.test	2007-10-31 16:01:26 +04:00
+++ b/mysql-test/t/partition.test	2007-11-12 14:26:07 +04:00
@@ -1528,15 +1528,4 @@ PARTITION BY RANGE (b) (
 show create table t1;
 drop table t1, t2;
 
-#
-# Bug #31893 Partitions: crash if subpartitions and engine change
-#
-create table t1 (int_column int, char_column char(5))
-  PARTITION BY RANGE (int_column) subpartition by key (char_column)
-  (PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
-alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
-  (PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
-show create table t1;
-drop table t1;
-
 --echo End of 5.1 tests
diff -Nrup a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
--- a/mysql-test/t/partition_innodb.test	2007-09-13 18:33:37 +05:00
+++ b/mysql-test/t/partition_innodb.test	2007-11-12 14:26:07 +04:00
@@ -142,3 +142,14 @@ PARTITION BY KEY(a) PARTITIONS 10;
 INSERT INTO t1 VALUES(1),(2);
 SELECT COUNT(*) FROM t1;
 DROP TABLE t1;
+
+#
+# Bug #31893 Partitions: crash if subpartitions and engine change
+#
+create table t1 (int_column int, char_column char(5))
+  PARTITION BY RANGE (int_column) subpartition by key (char_column)
+  (PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
+alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
+  (PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
+show create table t1;
+drop table t1;