MI_KEYSEG -> HA_KEYSEG

_mi_key_cmp -> ha_key_cmp


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

5 files changed, 16 insertions, 16 deletions

diff --git a/heap/heapdef.h b/heap/heapdef.h
index 53ad87a7d20..aeb345522f5 100644
--- a/heap/heapdef.h
+++ b/heap/heapdef.h
@@ -42,7 +42,7 @@ typedef struct st_hp_hash_info
 } HASH_INFO;
 
 typedef struct {
-  MI_KEYSEG *keyseg;
+  HA_KEYSEG *keyseg;
   uint key_length;
   uint search_flag;
 } heap_rb_param;
diff --git a/heap/hp_hash.c b/heap/hp_hash.c
index b13ce786f6d..92e6320211a 100644
--- a/heap/hp_hash.c
+++ b/heap/hp_hash.c
@@ -195,7 +195,7 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key)
 {
   /*register*/ 
   ulong nr=1, nr2=4;
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
 
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
@@ -242,7 +242,7 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const byte *rec)
 {
   /*register*/
   ulong nr=1, nr2=4;
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
 
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
@@ -300,7 +300,7 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const byte *rec)
 ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key)
 {
   register ulong nr=0;
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
 
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
@@ -341,7 +341,7 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key)
 ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const byte *rec)
 {
   register ulong nr=0;
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
 
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
@@ -381,7 +381,7 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const byte *rec)
 
 int hp_rec_key_cmp(HP_KEYDEF *keydef, const byte *rec1, const byte *rec2)
 {
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
 
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
@@ -412,7 +412,7 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const byte *rec1, const byte *rec2)
 
 int hp_key_cmp(HP_KEYDEF *keydef, const byte *rec, const byte *key)
 {
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
 
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ;
        seg < endseg ;
@@ -450,7 +450,7 @@ int hp_key_cmp(HP_KEYDEF *keydef, const byte *rec, const byte *key)
 
 void hp_make_key(HP_KEYDEF *keydef, byte *key, const byte *rec)
 {
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
 
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
@@ -464,7 +464,7 @@ void hp_make_key(HP_KEYDEF *keydef, byte *key, const byte *rec)
 void hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
 		    const byte *rec, byte *recpos)
 {
-  MI_KEYSEG *seg, *endseg;
+  HA_KEYSEG *seg, *endseg;
 
   /* -1 means that HA_KEYTYPE_END segment will not copy */
   for (seg= keydef->seg, endseg= seg + keydef->keysegs - 1; seg < endseg; 
@@ -481,7 +481,7 @@ void hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
 uint hp_rb_pack_key(HP_INFO *info, uint inx, uchar *key, const uchar *old,
                   uint k_length)
 {
-  MI_KEYSEG *seg, *endseg;
+  HA_KEYSEG *seg, *endseg;
   uchar *start_key= key;
   HP_KEYDEF *keydef= info->s->keydef + inx;
   
@@ -508,7 +508,7 @@ uint hp_rb_pack_key(HP_INFO *info, uint inx, uchar *key, const uchar *old,
 
 my_bool hp_if_null_in_key(HP_KEYDEF *keydef, const byte *record)
 {
-  MI_KEYSEG *seg,*endseg;
+  HA_KEYSEG *seg,*endseg;
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
     if (seg->null_bit && (record[seg->null_pos] & seg->null_bit))
diff --git a/heap/hp_open.c b/heap/hp_open.c
index a2423d5a4ff..49f9a2cfc33 100644
--- a/heap/hp_open.c
+++ b/heap/hp_open.c
@@ -41,7 +41,7 @@ HP_INFO *heap_open(const char *name, int mode, uint keys, HP_KEYDEF *keydef,
   uint i,j,key_segs,max_length,length;
   HP_INFO *info;
   HP_SHARE *share;
-  MI_KEYSEG *keyseg;
+  HA_KEYSEG *keyseg;
 
   DBUG_ENTER("heap_open");
 
@@ -72,14 +72,14 @@ HP_INFO *heap_open(const char *name, int mode, uint keys, HP_KEYDEF *keydef,
     }
     if (!(share = (HP_SHARE*) my_malloc((uint) sizeof(HP_SHARE)+
 				       keys*sizeof(HP_KEYDEF)+
-				       key_segs*sizeof(MI_KEYSEG),
+				       key_segs*sizeof(HA_KEYSEG),
 				       MYF(MY_ZEROFILL))))
     {
       pthread_mutex_unlock(&THR_LOCK_heap);
       DBUG_RETURN(0);
     }
     share->keydef=(HP_KEYDEF*) (share+1);
-    keyseg=(MI_KEYSEG*) (share->keydef+keys);
+    keyseg=(HA_KEYSEG*) (share->keydef+keys);
     init_block(&share->block,reclength+1,min_records,max_records);
 	/* Fix keys */
     memcpy(share->keydef,keydef,(size_t) (sizeof(keydef[0])*keys));
diff --git a/heap/hp_test1.c b/heap/hp_test1.c
index 124a2901402..79edfe2effc 100644
--- a/heap/hp_test1.c
+++ b/heap/hp_test1.c
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
   char record[128],key[32];
   const char *filename;
   HP_KEYDEF keyinfo[10];
-  MI_KEYSEG keyseg[4];
+  HA_KEYSEG keyseg[4];
   MY_INIT(argv[0]);
 
   filename= "test1";
diff --git a/heap/hp_test2.c b/heap/hp_test2.c
index 5d945dca282..f8b6a8cd7d3 100644
--- a/heap/hp_test2.c
+++ b/heap/hp_test2.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
   const char *filename,*filename2;
   HP_INFO *file,*file2;
   HP_KEYDEF keyinfo[MAX_KEYS];
-  MI_KEYSEG keyseg[MAX_KEYS*5];
+  HA_KEYSEG keyseg[MAX_KEYS*5];
   HEAP_PTR position;
   MY_INIT(argv[0]);		/* init my_sys library & pthreads */
   LINT_INIT(position);