bk commit into 5.1 tree (jimw:1.2170)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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
  1.2170 06/03/13 06:12:42 jimw@stripped +2 -0
  Merge mysql.com:/home/jimw/my/mysql-5.1-14673
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  mysql-test/t/partition.test
    1.21 06/03/13 06:12:37 jimw@stripped +0 -0
    SCCS merged

  mysql-test/r/partition.result
    1.18 06/03/13 06:12:06 jimw@stripped +0 -0
    SCCS merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean/RESYNC

--- 1.17/mysql-test/r/partition.result	2006-03-08 11:05:56 -08:00
+++ 1.18/mysql-test/r/partition.result	2006-03-13 06:12:06 -08:00
@@ -422,6 +422,12 @@
 x123	11,12	1
 x234	NULL,1	1
 drop table t1;
+create table t1 (a int)
+partition by list (a)
+(partition p0 values in (1));
+alter table t1 rebuild partition;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+drop table t1;
 create table t1 (a int) engine=innodb partition by hash(a) ;
 show table status like 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

--- 1.20/mysql-test/t/partition.test	2006-03-08 11:05:56 -08:00
+++ 1.21/mysql-test/t/partition.test	2006-03-13 06:12:37 -08:00
@@ -541,6 +541,18 @@
 drop table t1;
 
 #
+# BUG 17947 Crash with REBUILD PARTITION
+#
+create table t1 (a int)
+partition by list (a)
+(partition p0 values in (1));
+
+--error 1064
+alter table t1 rebuild partition;
+
+drop table t1;
+
+#
 # Bug #14673: Wrong InnoDB default row format
 #
 create table t1 (a int) engine=innodb partition by hash(a) ;