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()

4 files changed, 9 insertions, 6 deletions

diff --git a/include/heap.h b/include/heap.h
index 33bbd2f0b3f..6cacb7fc529 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -225,8 +225,8 @@ extern void heap_update_auto_increment(HP_INFO *info, const byte *record);
 ha_rows hp_rb_records_in_range(HP_INFO *info, int inx, key_range *min_key,
                                key_range *max_key);
 int hp_panic(enum ha_panic_function flag);
-int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key, 
-              ulonglong keypart_map, enum ha_rkey_function find_flag);
+int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key,
+              key_part_map keypart_map, enum ha_rkey_function find_flag);
 extern gptr heap_find(HP_INFO *info,int inx,const byte *key);
 extern int heap_check_heap(HP_INFO *info, my_bool print_status);
 extern byte *heap_position(HP_INFO *info);
diff --git a/include/my_base.h b/include/my_base.h
index 3aa280d825a..dd21362e8f7 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -395,7 +395,10 @@ enum ha_base_keytype {
 	/* Other constants */
 
 #define HA_NAMELEN 64			/* Max length of saved filename */
-#define NO_SUCH_KEY ((uint)~0)          /* used as a key no. */
+#define NO_SUCH_KEY (~(uint)0)          /* used as a key no. */
+
+typedef ulong key_part_map;
+#define HA_WHOLE_KEY  (~(key_part_map)0)
 
 	/* Intern constants in databases */
 
@@ -469,7 +472,7 @@ typedef struct st_key_range
 {
   const byte *key;
   uint length;
-  ulonglong keypart_map;
+  key_part_map keypart_map;
   enum ha_rkey_function flag;
 } key_range;
 
diff --git a/include/myisam.h b/include/myisam.h
index 1dd8f6f7ec4..b05440e5ae4 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -275,7 +275,7 @@ extern struct st_myisam_info *mi_open(const char *name,int mode,
 extern int mi_panic(enum ha_panic_function function);
 extern int mi_rfirst(struct st_myisam_info *file,byte *buf,int inx);
 extern 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);
 extern int mi_rlast(struct st_myisam_info *file,byte *buf,int inx);
 extern int mi_rnext(struct st_myisam_info *file,byte *buf,int inx);
 extern int mi_rnext_same(struct st_myisam_info *info, byte *buf);
diff --git a/include/myisammrg.h b/include/myisammrg.h
index 149b72dc7e1..02e81cf806d 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -87,7 +87,7 @@ extern int myrg_rnext(MYRG_INFO *file,byte *buf,int inx);
 extern int myrg_rprev(MYRG_INFO *file,byte *buf,int inx);
 extern int myrg_rnext_same(MYRG_INFO *file,byte *buf);
 extern 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);
 extern int myrg_rrnd(MYRG_INFO *file,byte *buf,ulonglong pos);
 extern int myrg_rsame(MYRG_INFO *file,byte *record,int inx);
 extern int myrg_update(MYRG_INFO *file,const byte *old,byte *new_rec);