bk commit into 5.1 tree (holyfoot:1.2644)

[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-13 09:41:59+04:00, holyfoot@stripped +2 -0
  test fixed

  mysql-test/r/partition_innodb.result@stripped, 2007-11-13 09:41:57+04:00, holyfoot@stripped
+4 -3
    result fixed

  mysql-test/t/partition_innodb.test@stripped, 2007-11-13 09:41:57+04:00, holyfoot@stripped +3
-2
    number of subpartitions fixed

diff -Nrup a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result
--- a/mysql-test/r/partition_innodb.result	2007-11-12 14:26:07 +04:00
+++ b/mysql-test/r/partition_innodb.result	2007-11-13 09:41:57 +04:00
@@ -137,14 +137,15 @@ 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 BY RANGE (int_column) subpartition by key (char_column) subpartitions 2
 (PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
-alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
+alter table t1 PARTITION BY RANGE (int_column)
+subpartition by key (char_column) subpartitions 2
 (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) */
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (int_column)
SUBPARTITION BY KEY (char_column) SUBPARTITIONS 2 (PARTITION p1 VALUES LESS THAN (5)
ENGINE = MyISAM) */
 drop table t1;
diff -Nrup a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
--- a/mysql-test/t/partition_innodb.test	2007-11-12 14:26:07 +04:00
+++ b/mysql-test/t/partition_innodb.test	2007-11-13 09:41:57 +04:00
@@ -147,9 +147,10 @@ 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 BY RANGE (int_column) subpartition by key (char_column) subpartitions 2
   (PARTITION p1 VALUES LESS THAN (5) ENGINE = InnoDB);
-alter table t1 PARTITION BY RANGE (int_column) subpartition by key (char_column)
+alter table t1 PARTITION BY RANGE (int_column)
+   subpartition by key (char_column) subpartitions 2
   (PARTITION p1 VALUES LESS THAN (5) ENGINE = myisam);
 show create table t1;
 drop table t1;