bk commit into 5.1 tree (mikael:1.2171)

[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.2171 06/03/14 01:39:27 mikael@zim.(none) +2 -0
  Manual merge

  sql/sql_partition.cc
    1.46 06/03/14 01:39:21 mikael@zim.(none) +2 -1
    Manual merge

  mysql-test/r/partition.result
    1.19 06/03/14 01:39:21 mikael@zim.(none) +2 -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/bug17127

--- 1.18/mysql-test/r/partition.result	2006-03-10 01:43:29 -08:00
+++ 1.19/mysql-test/r/partition.result	2006-03-14 01:39:21 -08:00
@@ -445,6 +445,8 @@
 ERROR HY000: Only RANGE PARTITIONING can use VALUES LESS THAN in partition definition
 alter table t1 add partition (partition p1 values in (2));
 ERROR HY000: Only LIST PARTITIONING can use VALUES IN in partition definition
+drop table t1;
+create table t1 (a int)
 partition by list (a)
 (partition p0 values in (1));
 alter table t1 rebuild partition;

--- 1.45/sql/sql_partition.cc	2006-03-10 01:40:57 -08:00
+++ 1.46/sql/sql_partition.cc	2006-03-14 01:39:21 -08:00
@@ -4135,7 +4135,8 @@
                         *fast_alter_partition, flags));
     if (((alter_info->flags & ALTER_ADD_PARTITION) ||
          (alter_info->flags & ALTER_REORGANIZE_PARTITION)) &&
-         (thd->lex->part_info->part_type != tab_part_info->part_type))
+         (thd->lex->part_info->part_type != tab_part_info->part_type) &&
+         (thd->lex->part_info->part_type != NOT_A_PARTITION))
     {
       if (thd->lex->part_info->part_type == RANGE_PARTITION)
       {