wl#3700 - post-review fixes:

s/ulonglong/key_part_map/, comments


include/heap.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/my_base.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/myisam.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
include/myisammrg.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/event_db_repository.cc:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/ha_partition.cc:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/ha_partition.h:
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/
sql/sql_select.h:
  wl#3700 - post-review fixes:
  remove tab_to_keypart_map()

20 files changed, 56 insertions, 57 deletions

diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
index d7e56f91af4..6f07c4183f1 100644
--- a/storage/blackhole/ha_blackhole.cc
+++ b/storage/blackhole/ha_blackhole.cc
@@ -152,7 +152,7 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd,
 
 
 int ha_blackhole::index_read(byte * buf, const byte * key,
-                             ulonglong keypart_map, uint key_len,
+                             key_part_map keypart_map,
                              enum ha_rkey_function find_flag)
 {
   DBUG_ENTER("ha_blackhole::index_read");
@@ -161,7 +161,7 @@ int ha_blackhole::index_read(byte * buf, const byte * key,
 
 
 int ha_blackhole::index_read_idx(byte * buf, uint idx, const byte * key,
-                                 ulonglong keypart_map, uint key_len,
+                                 key_part_map keypart_map,
                                  enum ha_rkey_function find_flag)
 {
   DBUG_ENTER("ha_blackhole::index_read_idx");
@@ -170,7 +170,7 @@ int ha_blackhole::index_read_idx(byte * buf, uint idx, const byte * key,
 
 
 int ha_blackhole::index_read_last(byte * buf, const byte * key,
-                                  ulonglong keypart_map)
+                                  key_part_map keypart_map)
 {
   DBUG_ENTER("ha_blackhole::index_read_last");
   DBUG_RETURN(HA_ERR_END_OF_FILE);
diff --git a/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h
index cd8b6491dba..2af12b33077 100644
--- a/storage/blackhole/ha_blackhole.h
+++ b/storage/blackhole/ha_blackhole.h
@@ -64,12 +64,11 @@ public:
   int rnd_init(bool scan);
   int rnd_next(byte *buf);
   int rnd_pos(byte * buf, byte *pos);
-  int index_read(byte * buf, const byte * key, ulonglong keypart_map,
-                 uint key_len, enum ha_rkey_function find_flag);
+  int index_read(byte * buf, const byte * key, key_part_map keypart_map,
+                 enum ha_rkey_function find_flag);
   int index_read_idx(byte * buf, uint idx, const byte * key,
-                   ulonglong keypart_map, uint key_len,
-                   enum ha_rkey_function find_flag);
-  int index_read_last(byte * buf, const byte * key, ulonglong keypart_map);
+                   key_part_map keypart_map, enum ha_rkey_function find_flag);
+  int index_read_last(byte * buf, const byte * key, key_part_map keypart_map);
   int index_next(byte * buf);
   int index_prev(byte * buf);
   int index_first(byte * buf);
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 01d508e3290..999e36a4242 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -415,7 +415,7 @@ int ha_example::delete_row(const byte * buf)
 */
 
 int ha_example::index_read(byte * buf, const byte * key,
-                           ulonglong keypart_map __attribute__((unused)),
+                           key_part_map keypart_map __attribute__((unused)),
                            enum ha_rkey_function find_flag
                            __attribute__((unused)))
 {
diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h
index ee60b412974..9777a478209 100644
--- a/storage/example/ha_example.h
+++ b/storage/example/ha_example.h
@@ -191,7 +191,7 @@ public:
     skip it and and MySQL will treat it as not implemented.
   */
   int index_read(byte * buf, const byte * key,
-                 ulonglong keypart_map, enum ha_rkey_function find_flag);
+                 key_part_map keypart_map, enum ha_rkey_function find_flag);
 
   /** @brief
     We implement this in ha_example.cc. It's not an obligatory method;
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index 9e6a7aea6c3..5831ec6167a 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -238,7 +238,7 @@ int ha_heap::delete_row(const byte * buf)
   return res;
 }
 
-int ha_heap::index_read(byte * buf, const byte * key, ulonglong keypart_map,
+int ha_heap::index_read(byte * buf, const byte * key, key_part_map keypart_map,
 			enum ha_rkey_function find_flag)
 {
   DBUG_ASSERT(inited==INDEX);
@@ -249,7 +249,7 @@ int ha_heap::index_read(byte * buf, const byte * key, ulonglong keypart_map,
   return error;
 }
 
-int ha_heap::index_read_last(byte *buf, const byte *key, ulonglong keypart_map)
+int ha_heap::index_read_last(byte *buf, const byte *key, key_part_map keypart_map)
 {
   DBUG_ASSERT(inited==INDEX);
   statistic_increment(table->in_use->status_var.ha_read_key_count,
@@ -261,7 +261,7 @@ int ha_heap::index_read_last(byte *buf, const byte *key, ulonglong keypart_map)
 }
 
 int ha_heap::index_read_idx(byte * buf, uint index, const byte * key,
-			    ulonglong keypart_map,
+			    key_part_map keypart_map,
                             enum ha_rkey_function find_flag)
 {
   statistic_increment(table->in_use->status_var.ha_read_key_count,
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h
index b49ded6e33d..a2d531fc515 100644
--- a/storage/heap/ha_heap.h
+++ b/storage/heap/ha_heap.h
@@ -75,11 +75,11 @@ public:
                                   ulonglong nb_desired_values,
                                   ulonglong *first_value,
                                   ulonglong *nb_reserved_values);
-  int index_read(byte * buf, const byte * key, ulonglong keypart_map,
+  int index_read(byte * buf, const byte * key, key_part_map keypart_map,
                  enum ha_rkey_function find_flag);
-  int index_read_last(byte *buf, const byte *key, ulonglong keypart_map);
+  int index_read_last(byte *buf, const byte *key, key_part_map keypart_map);
   int index_read_idx(byte * buf, uint index, const byte * key,
-                     ulonglong keypart_map, enum ha_rkey_function find_flag);
+                     key_part_map keypart_map, enum ha_rkey_function find_flag);
   int index_next(byte * buf);
   int index_prev(byte * buf);
   int index_first(byte * buf);
diff --git a/storage/heap/heapdef.h b/storage/heap/heapdef.h
index d9c3ff147b4..b52a6c60ac6 100644
--- a/storage/heap/heapdef.h
+++ b/storage/heap/heapdef.h
@@ -90,7 +90,7 @@ extern int hp_rec_key_cmp(HP_KEYDEF *keydef,const byte *rec1,
 extern int hp_key_cmp(HP_KEYDEF *keydef,const byte *rec,
 		      const byte *key);
 extern void hp_make_key(HP_KEYDEF *keydef,byte *key,const byte *rec);
-extern uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
+extern uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
 			   const byte *rec, byte *recpos);
 extern uint hp_rb_key_length(HP_KEYDEF *keydef, const byte *key);
 extern uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key);
@@ -99,8 +99,8 @@ extern my_bool hp_if_null_in_key(HP_KEYDEF *keyinfo, const byte *record);
 extern int hp_close(register HP_INFO *info);
 extern void hp_clear(HP_SHARE *info);
 extern void hp_clear_keys(HP_SHARE *info);
-extern uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, 
-                    ulonglong keypart_map);
+extern uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old,
+                           key_part_map keypart_map);
 #ifdef THREAD
 extern pthread_mutex_t THR_LOCK_heap;
 #else
diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c
index 326f6adea45..fbf3e541372 100644
--- a/storage/heap/hp_hash.c
+++ b/storage/heap/hp_hash.c
@@ -35,7 +35,7 @@
       HA_READ_KEY_EXACT		Include the key in the range
       HA_READ_AFTER_KEY		Don't include key in range
 
-    max_key.flag can have one of the following values:  
+    max_key.flag can have one of the following values:
       HA_READ_BEFORE_KEY	Don't include key in range
       HA_READ_AFTER_KEY		Include all 'end_key' values in the range
 
@@ -62,7 +62,7 @@ ha_rows hp_rb_records_in_range(HP_INFO *info, int inx,  key_range *min_key,
   {
     custom_arg.key_length= hp_rb_pack_key(keyinfo, (uchar*) info->recbuf,
 					  (uchar*) min_key->key,
-					  min_key->length);
+					  min_key->keypart_map);
     start_pos= tree_record_pos(rb_tree, info->recbuf, min_key->flag,
 			       &custom_arg);
   }
@@ -70,12 +70,12 @@ ha_rows hp_rb_records_in_range(HP_INFO *info, int inx,  key_range *min_key,
   {
     start_pos= 0;
   }
-  
+
   if (max_key)
   {
     custom_arg.key_length= hp_rb_pack_key(keyinfo, (uchar*) info->recbuf,
 					  (uchar*) max_key->key,
-                                          max_key->length);
+                                          max_key->keypart_map);
     end_pos= tree_record_pos(rb_tree, info->recbuf, max_key->flag,
 			     &custom_arg);
   }
@@ -772,7 +772,7 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
                               char_length / seg->charset->mbmaxlen);
       set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
       if (char_length < seg->length)
-        seg->charset->cset->fill(seg->charset, (char*) key + char_length, 
+        seg->charset->cset->fill(seg->charset, (char*) key + char_length,
                                  seg->length - char_length, ' ');
     }
     memcpy(key, rec + seg->start, (size_t) char_length);
@@ -784,11 +784,11 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
 
 
 uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old,
-                    ulonglong keypart_map)
+                    key_part_map keypart_map)
 {
   HA_KEYSEG *seg, *endseg;
   uchar *start_key= key;
-  
+
   for (seg= keydef->seg, endseg= seg + keydef->keysegs;
        seg < endseg && keypart_map; old+= seg->length, seg++)
   {
diff --git a/storage/heap/hp_rkey.c b/storage/heap/hp_rkey.c
index 98714bf875f..ced81985f99 100644
--- a/storage/heap/hp_rkey.c
+++ b/storage/heap/hp_rkey.c
@@ -16,7 +16,7 @@
 #include "heapdef.h"
 
 int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key, 
-              ulonglong keypart_map, enum ha_rkey_function find_flag)
+              key_part_map keypart_map, enum ha_rkey_function find_flag)
 {
   byte *pos;
   HP_SHARE *share= info->s;
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 6feb8e0146d..e9309f4f8b8 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -3927,14 +3927,14 @@ statement issued by the user. We also increment trx->n_mysql_tables_in_use.
 
   2) If prebuilt->sql_stat_start == TRUE we 'pre-compile' the MySQL search
 instructions to prebuilt->template of the table handle instance in
-::index_read_old. The template is used to save CPU time in large joins.
+::index_read. The template is used to save CPU time in large joins.
 
   3) In row_search_for_mysql, if prebuilt->sql_stat_start is true, we
 allocate a new consistent read view for the trx if it does not yet have one,
 or in the case of a locking read, set an InnoDB 'intention' table level
 lock on the table.
 
-  4) We do the SELECT. MySQL may repeatedly call ::index_read_old for the
+  4) We do the SELECT. MySQL may repeatedly call ::index_read for the
 same table handle instance, if it is a join.
 
   5) When the SELECT ends, MySQL removes its intention table level locks
@@ -3948,7 +3948,7 @@ table handler in that case has to execute the COMMIT in ::external_lock.
   B) If the user has explicitly set MySQL table level locks, then MySQL
 does NOT call ::external_lock at the start of the statement. To determine
 when we are at the start of a new SQL statement we at the start of
-::index_read_old also compare the query id to the latest query id where the
+::index_read also compare the query id to the latest query id where the
 table handle instance was used. If it has changed, we know we are at the
 start of a new SQL statement. Since the query id can theoretically
 overwrap, we use this test only as a secondary way of determining the
@@ -3985,7 +3985,7 @@ ha_innobase::index_read(
 	int		error;
 	ulint		ret;
 
-	DBUG_ENTER("index_read_old");
+	DBUG_ENTER("index_read");
 
 	ut_a(prebuilt->trx ==
 		(trx_t*) current_thd->ha_data[ht->slot]);
@@ -4067,7 +4067,7 @@ ha_innobase::index_read(
 }
 
 /***********************************************************************
-The following functions works like index_read_old, but it find the last
+The following functions works like index_read, but it find the last
 row with the current key value or prefix. */
 
 int
@@ -4173,7 +4173,7 @@ ha_innobase::index_read_idx(
 
 /***************************************************************************
 Reads the next or previous row from a cursor, which must have previously been
-positioned using index_read_old. */
+positioned using index_read. */
 
 int
 ha_innobase::general_fetch(
@@ -4222,7 +4222,7 @@ ha_innobase::general_fetch(
 
 /***************************************************************************
 Reads the next row from a cursor, which must have previously been
-positioned using index_read_old. */
+positioned using index_read. */
 
 int
 ha_innobase::index_next(
@@ -4258,7 +4258,7 @@ ha_innobase::index_next_same(
 
 /***************************************************************************
 Reads the previous row from a cursor, which must have previously been
-positioned using index_read_old. */
+positioned using index_read. */
 
 int
 ha_innobase::index_prev(
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index fb0c3eebc4d..48f1d9b2395 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -1555,7 +1555,7 @@ int ha_myisam::delete_row(const byte * buf)
   return mi_delete(file,buf);
 }
 
-int ha_myisam::index_read(byte *buf, const byte *key, ulonglong keypart_map,
+int ha_myisam::index_read(byte *buf, const byte *key, key_part_map keypart_map,
                           enum ha_rkey_function find_flag)
 {
   DBUG_ASSERT(inited==INDEX);
@@ -1567,7 +1567,7 @@ int ha_myisam::index_read(byte *buf, const byte *key, ulonglong keypart_map,
 }
 
 int ha_myisam::index_read_idx(byte *buf, uint index, const byte *key,
-                              ulonglong keypart_map,
+                              key_part_map keypart_map,
                               enum ha_rkey_function find_flag)
 {
   statistic_increment(table->in_use->status_var.ha_read_key_count,
@@ -1578,7 +1578,7 @@ int ha_myisam::index_read_idx(byte *buf, uint index, const byte *key,
 }
 
 int ha_myisam::index_read_last(byte *buf, const byte *key,
-                               ulonglong keypart_map)
+                               key_part_map keypart_map)
 {
   DBUG_ENTER("ha_myisam::index_read_last");
   DBUG_ASSERT(inited==INDEX);
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h
index b66a9e5cca4..647e72d53eb 100644
--- a/storage/myisam/ha_myisam.h
+++ b/storage/myisam/ha_myisam.h
@@ -69,11 +69,11 @@ class ha_myisam: public handler
   int write_row(byte * buf);
   int update_row(const byte * old_data, byte * new_data);
   int delete_row(const byte * buf);
-  int index_read(byte *buf, const byte *key, ulonglong keypart_map,
+  int index_read(byte *buf, const byte *key, key_part_map keypart_map,
                  enum ha_rkey_function find_flag);
   int index_read_idx(byte *buf, uint index, const byte *key,
-                     ulonglong keypart_map, enum ha_rkey_function find_flag);
-  int index_read_last(byte *buf, const byte *key, ulonglong keypart_map);
+                     key_part_map keypart_map, enum ha_rkey_function find_flag);
+  int index_read_last(byte *buf, const byte *key, key_part_map keypart_map);
   int index_next(byte * buf);
   int index_prev(byte * buf);
   int index_first(byte * buf);
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 5c67404559e..7a4d47954a5 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -532,7 +532,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
       mi_extra(info,HA_EXTRA_KEYREAD,0);
       bzero(info->lastkey,keyinfo->seg->length);
       if (!mi_rkey(info, info->rec_buff, key, (const byte*) info->lastkey,
-		   ULL(1), HA_READ_KEY_EXACT))
+		   (key_part_map)1, HA_READ_KEY_EXACT))
       {
 	/* Don't count this as a real warning, as myisamchk can't correct it */
 	uint save=param->warning_printed;
diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c
index 1b7ba676139..2f4915dec39 100644
--- a/storage/myisam/mi_key.c
+++ b/storage/myisam/mi_key.c
@@ -216,7 +216,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
 */
 
 uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
-                  ulonglong keypart_map, HA_KEYSEG **last_used_keyseg)
+                  key_part_map keypart_map, HA_KEYSEG **last_used_keyseg)
 {
   uchar *start_key=key;
   HA_KEYSEG *keyseg;
@@ -225,7 +225,7 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old,
 
   /* "one part" rtree key is 2*SPDIMS part key in MyISAM */
   if (info->s->keyinfo[keynr].key_alg == HA_KEY_ALG_RTREE)
-    keypart_map= (ULL(1) << (2*SPDIMS)) - 1;
+    keypart_map= (((key_part_map)1) << (2*SPDIMS)) - 1;
 
   /* only key prefixes are supported */
   DBUG_ASSERT(((keypart_map+1) & keypart_map) == 0);
diff --git a/storage/myisam/mi_range.c b/storage/myisam/mi_range.c
index 5e5fe3c6b22..2cdb02b2c80 100644
--- a/storage/myisam/mi_range.c
+++ b/storage/myisam/mi_range.c
@@ -21,7 +21,7 @@
 #include "myisamdef.h"
 #include "rt_index.h"
 
-static ha_rows _mi_record_pos(MI_INFO *, const byte *, ulonglong,
+static ha_rows _mi_record_pos(MI_INFO *, const byte *, key_part_map,
                               enum ha_rkey_function);
 static double _mi_search_pos(MI_INFO *,MI_KEYDEF *,uchar *, uint,uint,my_off_t);
 static uint _mi_keynr(MI_INFO *info,MI_KEYDEF *,uchar *, uchar *,uint *);
@@ -104,11 +104,11 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx,
     if (start_pos == HA_POS_ERROR || end_pos == HA_POS_ERROR)
       res=HA_POS_ERROR;
   }
-  
+
   if (info->s->concurrent_insert)
     rw_unlock(&info->s->key_root_lock[inx]);
   fast_mi_writeinfo(info);
-  
+
   DBUG_PRINT("info",("records: %ld",(ulong) (res)));
   DBUG_RETURN(res);
 }
@@ -117,7 +117,7 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx,
 	/* Find relative position (in records) for key in index-tree */
 
 static ha_rows _mi_record_pos(MI_INFO *info, const byte *key,
-                              ulonglong keypart_map,
+                              key_part_map keypart_map,
 			      enum ha_rkey_function search_flag)
 {
   uint inx=(uint) info->lastinx, nextflag, key_len;
diff --git a/storage/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c
index 2ff24d565b9..373ab303bf0 100644
--- a/storage/myisam/mi_rkey.c
+++ b/storage/myisam/mi_rkey.c
@@ -22,7 +22,7 @@
 	/* Ordinary search_flag is 0 ; Give error if no record with key */
 
 int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key,
-            ulonglong keypart_map, enum ha_rkey_function search_flag)
+            key_part_map keypart_map, enum ha_rkey_function search_flag)
 {
   uchar *key_buff;
   MYISAM_SHARE *share=info->s;
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index f1ca1754696..7325340b970 100644
--- a/storage/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.h
@@ -605,7 +605,7 @@ extern my_off_t _mi_new(MI_INFO *info,MI_KEYDEF *keyinfo,int level);
 extern uint _mi_make_key(MI_INFO *info,uint keynr,uchar *key,
 			 const byte *record,my_off_t filepos);
 extern uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key,
-                         uchar *old, ulonglong keypart_map,
+                         uchar *old, key_part_map keypart_map,
                          HA_KEYSEG **last_used_keyseg);
 extern int _mi_read_key_record(MI_INFO *info,my_off_t filepos,byte *buf);
 extern int _mi_read_cache(IO_CACHE *info,byte *buff,my_off_t pos,
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index df77931ddb5..96f7db6e633 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -179,7 +179,7 @@ int ha_myisammrg::delete_row(const byte * buf)
 }
 
 int ha_myisammrg::index_read(byte * buf, const byte * key,
-                             ulonglong keypart_map,
+                             key_part_map keypart_map,
                              enum ha_rkey_function find_flag)
 {
   statistic_increment(table->in_use->status_var.ha_read_key_count,
@@ -190,7 +190,7 @@ int ha_myisammrg::index_read(byte * buf, const byte * key,
 }
 
 int ha_myisammrg::index_read_idx(byte * buf, uint index, const byte * key,
-				 ulonglong keypart_map,
+				 key_part_map keypart_map,
                                  enum ha_rkey_function find_flag)
 {
   statistic_increment(table->in_use->status_var.ha_read_key_count,
@@ -201,7 +201,7 @@ int ha_myisammrg::index_read_idx(byte * buf, uint index, const byte * key,
 }
 
 int ha_myisammrg::index_read_last(byte * buf, const byte * key,
-                                  ulonglong keypart_map)
+                                  key_part_map keypart_map)
 {
   statistic_increment(table->in_use->status_var.ha_read_key_count,
 		      &LOCK_status);
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h
index 805a2cb04b6..7bbe659d4b7 100644
--- a/storage/myisammrg/ha_myisammrg.h
+++ b/storage/myisammrg/ha_myisammrg.h
@@ -56,11 +56,11 @@ class ha_myisammrg: public handler
   int write_row(byte * buf);
   int update_row(const byte * old_data, byte * new_data);
   int delete_row(const byte * buf);
-  int index_read(byte * buf, const byte * key, ulonglong keypart_map,
+  int index_read(byte * buf, const byte * key, key_part_map keypart_map,
                  enum ha_rkey_function find_flag);
   int index_read_idx(byte * buf, uint index, const byte * key,
-                     ulonglong keypart_map, enum ha_rkey_function find_flag);
-  int index_read_last(byte * buf, const byte * key, ulonglong keypart_map);
+                     key_part_map keypart_map, enum ha_rkey_function find_flag);
+  int index_read_last(byte * buf, const byte * key, key_part_map keypart_map);
   int index_next(byte * buf);
   int index_prev(byte * buf);
   int index_first(byte * buf);
diff --git a/storage/myisammrg/myrg_rkey.c b/storage/myisammrg/myrg_rkey.c
index 2273f7d62b8..0eefe7eb173 100644
--- a/storage/myisammrg/myrg_rkey.c
+++ b/storage/myisammrg/myrg_rkey.c
@@ -36,7 +36,7 @@
 */
 
 int myrg_rkey(MYRG_INFO *info,byte *buf,int inx, const byte *key,
-            ulonglong keypart_map, enum ha_rkey_function search_flag)
+            key_part_map keypart_map, enum ha_rkey_function search_flag)
 {
   byte *key_buff;
   uint pack_key_length;