bk commit into 5.1 tree (jimw:1.2172)

[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.2172 06/03/13 06:18:04 jimw@stripped +3 -0
  Merge mysql.com:/home/jimw/my/mysql-5.1-17497
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

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

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

  sql/sql_table.cc
    1.313 06/03/13 06:16:22 jimw@stripped +0 -0
    Auto 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.312/sql/sql_table.cc	2006-03-07 01:00:03 -08:00
+++ 1.313/sql/sql_table.cc	2006-03-13 06:16:22 -08:00
@@ -2073,6 +2073,11 @@
     char *part_syntax_buf;
     uint syntax_len;
     handlerton *engine_type;
+    if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
+    {
+      my_error(ER_PARTITION_NO_TEMPORARY, MYF(0));
+      goto err;
+    }
     while ((key= key_iterator++))
     {
       if (key->type == Key::FOREIGN_KEY)

--- 1.17/mysql-test/r/partition.result	2006-03-08 09:48:35 -08:00
+++ 1.18/mysql-test/r/partition.result	2006-03-13 06:17:44 -08:00
@@ -422,6 +422,35 @@
 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
+t1	PARTITION	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+drop table t1;
+create table t2 (s1 int not null auto_increment, primary key (s1)) partition by list (s1) (partition p1 values in (1),partition p2 values in (2),partition p3 values in (3),partition p4 values in (4));
+insert into t2 values (null),(null),(null);
+select * from t2;
+s1
+1
+2
+3
+select * from t2 where s1 < 2;
+s1
+1
+update t2 set s1 = s1 + 1 order by s1 desc;
+select * from t2 where s1 < 3;
+s1
+2
+select * from t2 where s1 = 2;
+s1
+2
+drop table t2;
 create temporary table t1 (a int) partition by hash(a);
 ERROR HY000: Cannot create temporary table with partitions
 End of 5.1 tests

--- 1.20/mysql-test/t/partition.test	2006-03-08 09:48:35 -08:00
+++ 1.21/mysql-test/t/partition.test	2006-03-13 06:17:59 -08:00
@@ -541,6 +541,37 @@
 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) ;
+show table status like 't1';
+drop table t1;
+
+#
+# Bug #14526: Partitions: indexed searches fail
+#
+create table t2 (s1 int not null auto_increment, primary key (s1)) partition by list (s1) (partition p1 values in (1),partition p2 values in (2),partition p3 values in (3),partition p4 values in (4));
+insert into t2 values (null),(null),(null);
+select * from t2;
+select * from t2 where s1 < 2;
+update t2 set s1 = s1 + 1 order by s1 desc;
+select * from t2 where s1 < 3;
+select * from t2 where s1 = 2;
+drop table t2;
+
+#
 # Bug #17497: Partitions: crash if add partition on temporary table
 #
 --error ER_PARTITION_NO_TEMPORARY