summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2007-03-17 00:13:25 +0100
committerunknown <serg@janus.mylan>2007-03-17 00:13:25 +0100
commitce4c93bfd213adecacad5d5d6b103da0bc16cc1f (patch)
tree37481f305868166d3013f273d8fccadb4776d51c /storage/myisammrg
parentec8c72194d2b3be3a78c5dd926f2ab210f30c423 (diff)
downloadmariadb-git-ce4c93bfd213adecacad5d5d6b103da0bc16cc1f.tar.gz
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()
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/ha_myisammrg.cc6
-rw-r--r--storage/myisammrg/ha_myisammrg.h6
-rw-r--r--storage/myisammrg/myrg_rkey.c2
3 files changed, 7 insertions, 7 deletions
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;