Fixes for Ia64

3 files changed, 14 insertions, 11 deletions

diff --git a/isam/create.c b/isam/create.c
index 9b5e9eaece4..bcdd6b0892a 100644
--- a/isam/create.c
+++ b/isam/create.c
@@ -241,11 +241,12 @@ int nisam_create(const char *name,uint keys,N_KEYDEF *keyinfo,
   share.base.keystart = share.state.key_file_length=MY_ALIGN(info_length,
 							  nisam_block_size);
   share.base.max_block=max_block;
-  share.base.max_key_length=ALIGN_SIZE(max_key_length+4);
+  share.base.max_key_length=(uint) ALIGN_SIZE(max_key_length+4);
   share.base.records=records;
   share.base.reloc=reloc;
   share.base.reclength=reclength;
-  share.base.pack_reclength=reclength+packed-share.base.blobs*sizeof(char*);
+  share.base.pack_reclength=
+    (uint) (reclength+packed-share.base.blobs*sizeof(char*));
   share.base.max_pack_length=pack_reclength;
   share.base.min_pack_length=min_pack_length;
   share.base.pack_bits=packed;
diff --git a/isam/delete.c b/isam/delete.c
index 9c66e241147..e50ad72c767 100644
--- a/isam/delete.c
+++ b/isam/delete.c
@@ -439,7 +439,7 @@ static int underflow(register N_INFO *info, register N_KEYDEF *keyinfo,
       t_length=(int) _nisam_get_pack_key_length(keyinfo,nod_flag,(uchar*) 0,
 					     (uchar*) 0, leaf_key,&s_temp);
       s_temp.n_length= *half_pos;	/* For _nisam_store_key */
-      length=(buff+getint(buff))-half_pos;
+      length=(uint) ((buff+getint(buff))-half_pos);
       bmove((byte*) buff+p_length+t_length,(byte*) half_pos,(size_t) length);
       _nisam_store_key(keyinfo,buff+p_length,&s_temp);
       putint(buff,length+t_length+p_length,nod_flag);
@@ -566,7 +566,7 @@ static uint remove_key(N_KEYDEF *keyinfo, uint nod_flag,
   else
   {					 /* Let keypos point at next key */
     VOID((*keyinfo->get_key)(keyinfo,nod_flag,&keypos,lastkey));
-    s_length=(keypos-start);
+    s_length=(uint) (keypos-start);
     if (keyinfo->base.flag & HA_PACK_KEY)
     {
       diff_flag= (keyinfo->seg[0].base.flag & HA_SPACE_PACK);
@@ -576,12 +576,12 @@ static uint remove_key(N_KEYDEF *keyinfo, uint nod_flag,
 	if ((r_length= *keypos++ & 127) == 0)
 	{				/* Same key after */
 	  if (first & 128)
-	    start++;			/* Skipp ref length */
+	    start++;			/* Skip ref length */
 	  if (diff_flag)
-	    start+= *start+1;		/* Skipp key length */
+	    start+= *start+1;		/* Skip key length */
 	  else
 	    start+=keyinfo->seg[0].base.length- (first & 127);
-	  s_length=(keypos-start);	/* Remove pointers and next-key-flag */
+	  s_length=(uint)(keypos-start); /* Remove pntrs and next-key-flag */
 	}
 	else if (! (first & 128))
 	{				/* Deleted key was not compressed */
@@ -589,12 +589,12 @@ static uint remove_key(N_KEYDEF *keyinfo, uint nod_flag,
 	  {
 	    *start= (uchar) (r_length+ *keypos);
 	    start+=r_length+1;		/* Let ref-part remain */
-	    s_length=(keypos-start)+1;	/* Skipp everything between */
+	    s_length=(uint) (keypos-start)+1;	/* Skip everything between */
 	  }
 	  else
 	  {
 	    start+=r_length+1;		/* Let ref-part remain */
-	    s_length=(keypos-start);	/* Skipp everything between */
+	    s_length=(uint) (keypos-start);	/* Skip everything between */
 	  }
 	}
 	else if ((first & 127) < r_length)
@@ -604,7 +604,7 @@ static uint remove_key(N_KEYDEF *keyinfo, uint nod_flag,
 	  if (diff_flag)
 	    *start++= (uchar) (*keypos++ + r_length);
 	  start+= r_length;
-	  s_length=(keypos-start);	/* Skipp everything between */
+	  s_length=(uint) (keypos-start);	/* Skip everything between */
 	}
       }
     }
@@ -613,3 +613,5 @@ static uint remove_key(N_KEYDEF *keyinfo, uint nod_flag,
 	(uint) (page_end-start-s_length));
   DBUG_RETURN((uint) s_length);
 } /* remove_key */
+
+
diff --git a/isam/write.c b/isam/write.c
index 110dc70fe53..49b0916afc4 100644
--- a/isam/write.c
+++ b/isam/write.c
@@ -247,7 +247,7 @@ int _nisam_insert(register N_INFO *info, register N_KEYDEF *keyinfo,
 		       s_temp.n_ref_length,s_temp.n_length,s_temp.key));
   }
 #endif
-  key_offset = (endpos-key_pos);
+  key_offset = (uint)(endpos-key_pos);
   if((int) t_length < 0)
     key_offset += (int) t_length;
   if (key_offset < 0)