bk commit into 5.1 tree (mikael:1.2181)

[Mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikael. When mikael 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.2181 06/03/14 03:46:12 mikael@zim.(none) +3 -0
  Manual merge

  sql/sql_partition.cc
    1.49 06/03/14 03:46:06 mikael@zim.(none) +1 -1
    Manual merge

  mysql-test/t/partition.test
    1.26 06/03/14 03:46:06 mikael@zim.(none) +3 -3
    Manual merge

  mysql-test/r/partition.result
    1.23 06/03/14 03:46:06 mikael@zim.(none) +1 -0
    Manual merge

# 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:	mikael
# Host:	zim.(none)
# Root:	/home/mikael/bug16370

--- 1.22/mysql-test/r/partition.result	2006-03-14 02:50:24 -08:00
+++ 1.23/mysql-test/r/partition.result	2006-03-14 03:46:06 -08:00
@@ -476,6 +476,7 @@
 (partition p0 values less than (0),
 partition p1 values less than (1) (subpartition sp0));
 ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '))' at line 5
+create table t1 (a int)
 partition by hash (a)
 (partition p0 (subpartition sp0));
 ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

--- 1.25/mysql-test/t/partition.test	2006-03-14 02:50:24 -08:00
+++ 1.26/mysql-test/t/partition.test	2006-03-14 03:46:06 -08:00
@@ -504,14 +504,14 @@
 drop table t1;
 
 # NULL for LIST partition
---error 1473
+--error ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR
 create table t1 (a int,b int, c int)
 partition by list(a)
 partitions 2
 (partition x123 values in (11,12),
  partition x234 values in (1 ,NULL, NULL));
 
---error 1473
+--error ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR
 create table t1 (a int,b int, c int)
 partition by list(a)
 partitions 2
@@ -523,7 +523,7 @@
 partitions 2
 (partition x123 values in (11, 12),
  partition x234 values in (5, 1));
---error 1504
+--error ER_NO_PARTITION_FOR_GIVEN_VALUE
 insert into t1 values (NULL,1,1);
 drop table t1;
 

--- 1.48/sql/sql_partition.cc	2006-03-14 02:40:54 -08:00
+++ 1.49/sql/sql_partition.cc	2006-03-14 03:46:06 -08:00
@@ -704,7 +704,7 @@
                  part_info->part_type == LIST_PARTITION))))
   {
     /* Only RANGE and LIST partitioning can be subpartitioned */
-    my_error(ER_PARTITION_SUBPART_MIX_ERROR, MYF(0));
+    my_error(ER_SUBPARTITION_ERROR, MYF(0));
     goto end;
   }
   if (unlikely(part_info->set_up_defaults_for_partitioning(file,