From: Date: February 15 2006 11:35am
Subject: bk commit into 5.1 tree (gluh:1.2108) BUG#16907
List-Archive: http://lists.mysql.com/commits/2636
X-Bug: 16907
Message-Id: <20060215103503.680565288D5@eagle.intranet.mysql.r18.ru>

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.2108 06/02/15 14:34:51 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.35 06/02/15 14:34:45 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.13 06/02/15 14:34:45 gluh@stripped +12 -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

  mysql-test/r/partition.result
    1.12 06/02/15 14:34:45 gluh@stripped +11 -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

# 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/Merge/5.1-new

--- 1.11/mysql-test/r/partition.result	Wed Feb 15 13:42:36 2006
+++ 1.12/mysql-test/r/partition.result	Wed Feb 15 14:34:45 2006
@@ -289,3 +289,14 @@ select * from t1 where f1 = 2;
 f1	f2	f3
 2	2	2
 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.12/mysql-test/t/partition.test	Wed Feb 15 13:42:36 2006
+++ 1.13/mysql-test/t/partition.test	Wed Feb 15 14:34:45 2006
@@ -368,3 +368,15 @@ insert into t1 values(2,2,'2');
 select * from t1 where f1 = 2;
 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.34/sql/sql_partition.cc	Wed Feb 15 13:42:36 2006
+++ 1.35/sql/sql_partition.cc	Wed Feb 15 14:34:45 2006
@@ -6009,7 +6009,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;
   }