Merge dator5.(none):/home/pappa/clean-mysql-5.1

into  dator5.(none):/home/pappa/bug21210


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged

1 files changed, 0 insertions, 37 deletions

diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index 928d855f9f4..d71de57dc14 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -43,27 +43,6 @@ partition by key(a)
 partitions 1e+300;
 
 #
-# Bug 21173: SHOW TABLE STATUS crashes server in InnoDB
-#
-create table t1 (a int)
-engine = innodb
-partition by key (a);
-show table status;
-insert into t1 values (0), (1), (2), (3);
-show table status;
-drop table t1;
-
-create table t1 (a int auto_increment primary key)
-engine = innodb
-partition by key (a);
-show table status;
-insert into t1 values (NULL), (NULL), (NULL), (NULL);
-show table status;
-insert into t1 values (NULL), (NULL), (NULL), (NULL);
-show table status;
-drop table t1;
-
-#
 # Bug 21350: Data Directory problems
 #
 -- error 1103
@@ -1194,22 +1173,6 @@ set session sql_mode='';
 drop table t1;
 
 #
-# BUG 19122 Crash after ALTER TABLE t1 REBUILD PARTITION p1
-#
-create table t1 (a int)
-partition by key (a)
-(partition p1 engine = innodb);
-
-alter table t1 rebuild partition p1;
-alter table t1 rebuild partition p1;
-alter table t1 rebuild partition p1;
-alter table t1 rebuild partition p1;
-alter table t1 rebuild partition p1;
-alter table t1 rebuild partition p1;
-alter table t1 rebuild partition p1;
-drop table t1;
-
-#
 # BUG 19304 Partitions: MERGE handler not allowed in partitioned tables
 #
 --error ER_PARTITION_MERGE_ERROR