Commit 7d383909 authored by unknown's avatar unknown
Browse files

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()
parent 929b7b1b

include/heap.h

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 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);

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

include/my_base.h

+5 −2
Original line number Diff line number Diff line
@@ -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;

include/myisam.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/myisammrg.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

sql/event_db_repository.cc

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ Event_db_repository::index_read_for_db_for_i_s(THD *thd, TABLE *schema_table, 
  {

    key_copy(key_buf, event_table->record[0], key_info, key_len);

    if (!(ret= event_table->file->index_read(event_table->record[0], key_buf,

                                             (ulonglong)1, HA_READ_PREFIX)))

                                             (key_part_map)1, HA_READ_PREFIX)))

    {

      DBUG_PRINT("info",("Found rows. Let's retrieve them. ret=%d", ret));

      do
@@ -843,7 +843,7 @@ Event_db_repository::find_named_event(THD *thd, LEX_STRING db, LEX_STRING name, 


  key_copy(key, table->record[0], table->key_info, table->key_info->key_length);



  if (table->file->index_read_idx(table->record[0], 0, key, ~ULL(0),

  if (table->file->index_read_idx(table->record[0], 0, key, HA_WHOLE_KEY,

                                  HA_READ_KEY_EXACT))

  {

    DBUG_PRINT("info", ("Row not found"));