diff options
| author | ram@gw.udmsearch.izhnet.ru <> | 2002-04-25 15:10:29 +0500 |
|---|---|---|
| committer | ram@gw.udmsearch.izhnet.ru <> | 2002-04-25 15:10:29 +0500 |
| commit | b8a12a8cecf2d277e724827ead7b93a129123362 (patch) | |
| tree | fae16eacfad983f202e51e4a4398875f00513543 /include | |
| parent | eab2893dac4f2447baf6b1b2b4f70869e974bf44 (diff) | |
| download | mariadb-git-b8a12a8cecf2d277e724827ead7b93a129123362.tar.gz | |
MI_KEYSEG -> HA_KEYSEG
_mi_key_cmp -> ha_key_cmp
Diffstat (limited to 'include')
| -rw-r--r-- | include/heap.h | 2 | ||||
| -rw-r--r-- | include/my_handler.h | 8 | ||||
| -rw-r--r-- | include/myisam.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/heap.h b/include/heap.h index ebcad285f55..088bb1241b2 100644 --- a/include/heap.h +++ b/include/heap.h @@ -85,7 +85,7 @@ typedef struct st_hp_keydef /* Key definition with open */ uint length; /* Length of key (automatic) */ uint8 algorithm; /* HASH / BTREE */ uint ref_offs; /* Data reference offset */ - MI_KEYSEG *seg; + HA_KEYSEG *seg; HP_BLOCK block; /* Where keys are saved */ TREE rb_tree; int (*write_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo, diff --git a/include/my_handler.h b/include/my_handler.h index ddbb33cd93f..0fa30f580b6 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -23,7 +23,7 @@ #include "m_ctype.h" #include "myisampack.h" -typedef struct st_MI_KEYSEG /* Key-portion */ +typedef struct st_HA_KEYSEG /* Key-portion */ { uint8 type; /* Type of key (for sort) */ uint8 language; @@ -34,7 +34,7 @@ typedef struct st_MI_KEYSEG /* Key-portion */ uint32 start; /* Start of key in record */ uint32 null_pos; /* position to NULL indicator */ CHARSET_INFO *charset; -} MI_KEYSEG; +} HA_KEYSEG; #define get_key_length(length,key) \ { if ((uchar) *(key) != 255) \ @@ -52,11 +52,11 @@ typedef struct st_MI_KEYSEG /* Key-portion */ extern int _mi_compare_text(CHARSET_INFO *, uchar *, uint, uchar *, uint , my_bool); -extern int _mi_key_cmp(register MI_KEYSEG *keyseg, register uchar *a, +extern int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, register uchar *b, uint key_length, uint nextflag, uint *diff_pos); -extern int hp_rb_key_cmp(register MI_KEYSEG *keyseg, register uchar *a, +extern int hp_rb_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, register uchar *b, uint key_length, uint nextflag, uint *diff_pos); diff --git a/include/myisam.h b/include/myisam.h index bf714dfef8a..96cbeaf0cd4 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -122,7 +122,7 @@ typedef struct st_mi_keydef /* Key definition with open & info */ uint16 block_size; /* block_size (auto) */ uint32 version; /* For concurrent read/write */ - MI_KEYSEG *seg,*end; + HA_KEYSEG *seg,*end; int (*bin_search)(struct st_myisam_info *info,struct st_mi_keydef *keyinfo, uchar *page,uchar *key, uint key_len,uint comp_flag,uchar * *ret_pos, @@ -146,7 +146,7 @@ typedef struct st_unique_def /* Segment definition of unique */ uint16 keysegs; /* Number of key-segment */ uchar key; /* Mapped to which key */ uint8 null_are_equal; - MI_KEYSEG *seg,*end; + HA_KEYSEG *seg,*end; } MI_UNIQUEDEF; typedef struct st_mi_decode_tree /* Decode huff-table */ @@ -318,7 +318,7 @@ typedef struct st_sort_info { char *record,*buff; void *wordlist, *wordptr; MI_KEYDEF *keyinfo; - MI_KEYSEG *keyseg; + HA_KEYSEG *keyseg; } SORT_INFO; typedef struct st_mi_check_param |