bk commit into 5.1 tree (gluh:1.2091) BUG#16907

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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.2091 06/02/10 12:40:31 gluh@stripped +3 -0
  Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
   In presense of subpartitioning use get_part_partition_id() to calculate part_id

  sql/sql_partition.cc
    1.31 06/02/10 12:40:25 gluh@stripped +4 -1
    Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
     In presense of subpartitioning use get_part_partition_id() to calculate part_id

  mysql-test/t/partition.test
    1.12 06/02/10 12:40:25 gluh@stripped +12 -0
    Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
     test case

  mysql-test/r/partition.result
    1.11 06/02/10 12:40:25 gluh@stripped +11 -0
    Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
     test case

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.1.16907

--- 1.10/mysql-test/r/partition.result	Wed Jan 18 14:56:17 2006
+++ 1.11/mysql-test/r/partition.result	Fri Feb 10 12:40:25 2006
@@ -278,3 +278,14 @@ partition p1 values in (14)
 insert into t1 values (10,1);
 ERROR HY000: Table has no partition for value 11
 drop table t1;
+create table t1 (f1 integer,f2 integer, unique index(f1))
+partition by range(f1 div 2)
+subpartition by hash(f1) subpartitions 2
+(partition partb values less than (2),
+partition parte values less than (4),
+partition partf values less than (10000));
+insert into t1 values(10,1);
+select * from t1 where f1 = 10;
+f1	f2
+10	1
+drop table t1;

--- 1.11/mysql-test/t/partition.test	Wed Jan 18 15:09:00 2006
+++ 1.12/mysql-test/t/partition.test	Fri Feb 10 12:40:25 2006
@@ -353,3 +353,15 @@ insert into t1 values (10,1);
 
 drop table t1;
 
+#
+# Bug #16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
+#
+create table t1 (f1 integer,f2 integer, unique index(f1))
+partition by range(f1 div 2)
+subpartition by hash(f1) subpartitions 2
+(partition partb values less than (2),
+partition parte values less than (4),
+partition partf values less than (10000));
+insert into t1 values(10,1);
+select * from t1 where f1 = 10;
+drop table t1;

--- 1.30/sql/sql_partition.cc	Tue Feb  7 19:31:10 2006
+++ 1.31/sql/sql_partition.cc	Fri Feb 10 12:40:25 2006
@@ -6005,7 +6005,10 @@ static uint32 get_next_partition_via_wal
     field->store(part_iter->field_vals.start, FALSE);
     part_iter->field_vals.start++;
     longlong dummy;
-    if (!part_iter->part_info->get_partition_id(part_iter->part_info, 
+    if (is_sub_partitioned(part_iter->part_info) &&
+        !part_iter->part_info->get_part_partition_id(part_iter->part_info,
+                                                     &part_id, &dummy) ||
+        !part_iter->part_info->get_partition_id(part_iter->part_info,
                                                 &part_id, &dummy))
       return part_id;
   }