From: Mattias Jonsson
Date: July 9 2010 12:41pm
Subject: bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3474)
List-Archive: http://lists.mysql.com/commits/113248
Message-Id: <201007091242.o69CgFXV015096@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6959200943810604860=="

--===============6959200943810604860==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/ based on revid:mattias.jonsson@stripped

 3474 Mattias Jonsson	2010-07-09 [merge]
      merge

    modified:
      sql/ha_partition.h
      sql/handler.h
=== modified file 'sql/ha_partition.h'
--- a/sql/ha_partition.h	2010-07-08 23:09:31 +0000
+++ b/sql/ha_partition.h	2010-07-09 12:40:49 +0000
@@ -53,8 +53,7 @@ typedef struct st_ha_data_partition
                                         HA_CAN_FULLTEXT | \
                                         HA_DUPLICATE_POS | \
                                         HA_CAN_SQL_HANDLER | \
-                                        HA_CAN_INSERT_DELAYED | \
-                                        HA_PRIMARY_KEY_REQUIRED_FOR_POSITION)
+                                        HA_CAN_INSERT_DELAYED)
 class ha_partition :public handler
 {
 private:
@@ -775,9 +774,6 @@ public:
 
     HA_PRIMARY_KEY_REQUIRED_FOR_POSITION:
     Does the storage engine need a PK for position?
-    Used with hidden primary key in InnoDB.
-    Hidden primary keys cannot be supported by partitioning, since the
-    partitioning expressions columns must be a part of the primary key.
     (InnoDB)
 
     HA_FILE_BASED is always set for partition handler since we use a

=== modified file 'sql/handler.h'
--- a/sql/handler.h	2010-06-10 20:45:22 +0000
+++ b/sql/handler.h	2010-07-09 12:40:49 +0000
@@ -93,7 +93,10 @@
 #define HA_PRIMARY_KEY_IN_READ_INDEX (1 << 15)
 /*
   If HA_PRIMARY_KEY_REQUIRED_FOR_POSITION is set, it means that to position()
-  uses a primary key. Without primary key, we can't call position().
+  uses a primary key given by the record argument.
+  Without primary key, we can't call position().
+  If not set, the position is returned as the current rows position
+  regardless of what argument is given.
 */ 
 #define HA_PRIMARY_KEY_REQUIRED_FOR_POSITION (1 << 16) 
 #define HA_CAN_RTREEKEYS       (1 << 17)
@@ -1446,10 +1449,9 @@ public:
   virtual int rnd_next(uchar *buf)=0;
   virtual int rnd_pos(uchar * buf, uchar *pos)=0;
   /**
-    One has to use this method when to find
-    random position by record as the plain
-    position() call doesn't work for some
-    handlers for random position.
+    This function only works for handlers having
+    HA_PRIMARY_KEY_REQUIRED_FOR_POSITION set.
+    It will return the row with the PK given in the record argument.
   */
   virtual int rnd_pos_by_record(uchar *record)
     {
@@ -1467,6 +1469,12 @@ public:
     { return HA_ERR_WRONG_COMMAND; }
   virtual ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key)
     { return (ha_rows) 10; }
+  /*
+    If HA_PRIMARY_KEY_REQUIRED_FOR_POSITION is set, then it sets ref
+    (reference to the row, aka position, with the primary key given in
+    the record).
+    Otherwise it set ref to the current row.
+  */
   virtual void position(const uchar *record)=0;
   virtual int info(uint)=0; // see my_base.h for full description
   virtual void get_dynamic_partition_info(PARTITION_INFO *stat_info,


--===============6959200943810604860==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   5z2j2l51m7lq10c8
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# testament_sha1: b61a3a69b29e72ee3994f6c36f2d63be13810e90
# timestamp: 2010-07-09 14:41:58 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/b49161-51-bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   x6srbt2k8lvy8hu5
# 
# Begin bundle
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


--===============6959200943810604860==--