From: Mattias Jonsson
Date: July 9 2010 11:15am
Subject: bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3394) Bug#52517
List-Archive: http://lists.mysql.com/commits/113229
X-Bug: 52517
Message-Id: <201007091117.o69BHV9c014638@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8105566693352918850=="

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

#At file:///Users/mattiasj/mysql-bzr/b52517-51-bugteam/ based on revid:gshchepa@stripped

 3394 Mattias Jonsson	2010-07-09
      Bug#52517: Regression in ROW level replication performance with partitions
      
      In bug-28430 HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
      was disabled in the partitioning engine in the first patch,
      That bug was later fixed a second time, but that flag
      was not removed.
      
      No need to disable this flag, as it leads to bad
      choise in row replication.
     @ sql/ha_partition.h
        Not disabling HA_PRIMARY_KEY_REQUIRED_FOR_POSITION flag.
        Updated comment (has nothing to do with hidden key.
     @ sql/handler.h
        Updated comments to about HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.

    modified:
      sql/ha_partition.h
      sql/handler.h
=== modified file 'sql/ha_partition.h'
--- a/sql/ha_partition.h	2009-11-17 19:02:16 +0000
+++ b/sql/ha_partition.h	2010-07-09 11:15:26 +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:
@@ -766,9 +765,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-04-14 09:53:59 +0000
+++ b/sql/handler.h	2010-07-09 11:15:26 +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,


--===============8105566693352918850==
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\
#   2hcdoe6rjf30l7yo
# target_branch: file:///Users/mattiasj/mysql-bzr/b52517-51-bugteam/
# testament_sha1: 136cd5dc3750e28d71a9148ed5cefa7c81e6ae3c
# timestamp: 2010-07-09 13:15:43 +0200
# base_revision_id: gshchepa@stripped
# 
# Begin bundle
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


--===============8105566693352918850==--