Portability fixes

Don't define crc32 if we are not linking with gzip

3 files changed, 12 insertions, 8 deletions

diff --git a/heap/_check.c b/heap/_check.c
index d4c4c26b346..233cb8cb0c5 100644
--- a/heap/_check.c
+++ b/heap/_check.c
@@ -163,8 +163,8 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records,
     {
       memcpy(&recpos, key + (*keydef->get_key_length)(keydef,key), sizeof(byte*));
       key_length= hp_rb_make_key(keydef, info->recbuf, recpos, 0);
-      if (ha_key_cmp(keydef->seg, info->recbuf, key, key_length, 
-		     SEARCH_FIND | SEARCH_SAME, &not_used))
+      if (ha_key_cmp(keydef->seg, (uchar*) info->recbuf, (uchar*) key,
+		     key_length, SEARCH_FIND | SEARCH_SAME, &not_used))
       {
 	error= 1;
 	DBUG_PRINT("error",("Record in wrong link:  key: %d  Record: %lx\n", 
diff --git a/heap/hp_hash.c b/heap/hp_hash.c
index cd70d2ab532..e315c1bbcb8 100644
--- a/heap/hp_hash.c
+++ b/heap/hp_hash.c
@@ -35,7 +35,8 @@ ha_rows hp_rb_records_in_range(HP_INFO *info, int inx, const byte *start_key,
   custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
   if (start_key)
   {
-    custom_arg.key_length= hp_rb_pack_key(keyinfo, info->recbuf, start_key, 
+    custom_arg.key_length= hp_rb_pack_key(keyinfo, (uchar*) info->recbuf,
+					  (uchar*) start_key, 
 					  start_key_len);
     start_pos= tree_record_pos(rb_tree, info->recbuf, start_search_flag, 
 			       &custom_arg);
@@ -47,8 +48,8 @@ ha_rows hp_rb_records_in_range(HP_INFO *info, int inx, const byte *start_key,
   
   if (end_key)
   {
-    custom_arg.key_length= hp_rb_pack_key(keyinfo, info->recbuf, end_key,
-					  end_key_len);
+    custom_arg.key_length= hp_rb_pack_key(keyinfo, (uchar*) info->recbuf,
+					  (uchar*) end_key, end_key_len);
     end_pos= tree_record_pos(rb_tree, info->recbuf, end_search_flag, 
 			     &custom_arg);
   }
@@ -370,7 +371,8 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const byte *rec1, const byte *rec2)
     }
     if (seg->type == HA_KEYTYPE_TEXT)
     {
-      if (my_strnncoll(seg->charset,rec1+seg->start,seg->length,rec2+seg->start,seg->length))
+      if (my_strnncoll(seg->charset,(uchar*) rec1+seg->start,seg->length,
+		       (uchar*) rec2+seg->start,seg->length))
 	return 1;
     }
     else
@@ -402,7 +404,8 @@ int hp_key_cmp(HP_KEYDEF *keydef, const byte *rec, const byte *key)
     }
     if (seg->type == HA_KEYTYPE_TEXT)
     {
-      if (my_strnncoll(seg->charset,rec+seg->start,seg->length,key,seg->length))
+      if (my_strnncoll(seg->charset,(uchar*) rec+seg->start, seg->length,
+		       (uchar*) key, seg->length))
 	return 1;
     }
     else
diff --git a/heap/hp_rkey.c b/heap/hp_rkey.c
index 92d2982a457..91d762ab4db 100644
--- a/heap/hp_rkey.c
+++ b/heap/hp_rkey.c
@@ -38,7 +38,8 @@ int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key,
 
     custom_arg.keyseg= info->s->keydef[inx].seg;
     custom_arg.key_length= info->lastkey_len= 
-			hp_rb_pack_key(keyinfo, info->recbuf, key, key_len);
+      hp_rb_pack_key(keyinfo, (uchar*) info->recbuf,
+		     (uchar*) key, key_len);
     custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
     /* for next rkey() after deletion */
     if (find_flag == HA_READ_AFTER_KEY)