From 2ba0846a60ac43e1ef477bdfd95c37901b6c7fe7 Mon Sep 17 00:00:00 2001
From: "monty@donna.mysql.fi" <>
Date: Thu, 17 May 2001 00:46:50 +0300
Subject: Fixed bug when using MERGE on files > 4G Fixed bug in SELECT
 db1.table.* FROM db1.table,db2.table Fixed bug in INSERT DELAYED when doing
 shutdown and a table was locked Changed that tmp_table_size =4G-1 means
 unlimited.

---
 myisam/mi_rkey.c   | 2 +-
 myisam/mi_search.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'myisam')

diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c
index 84612779f5d..0df390412b9 100644
--- a/myisam/mi_rkey.c
+++ b/myisam/mi_rkey.c
@@ -28,7 +28,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len,
   uchar *key_buff;
   MYISAM_SHARE *share=info->s;
   uint pack_key_length;
-  DBUG_ENTER("_mi_rkey");
+  DBUG_ENTER("mi_rkey");
   DBUG_PRINT("enter",("base: %lx  inx: %d  search_flag: %d",
 		      info,inx,search_flag));
 
diff --git a/myisam/mi_search.c b/myisam/mi_search.c
index 4dc5a5099d5..2c04679ed4c 100644
--- a/myisam/mi_search.c
+++ b/myisam/mi_search.c
@@ -158,7 +158,7 @@ int _mi_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
   info->page_changed=0;
   info->buff_used= (info->buff != buff);	/* If we have to reread buff */
 
-  DBUG_PRINT("exit",("found key at %ld",info->lastpos));
+  DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos));
   DBUG_RETURN(0);
 err:
   DBUG_PRINT("exit",("Error: %d",my_errno));
@@ -1276,7 +1276,7 @@ int _mi_search_next(register MI_INFO *info, register MI_KEYDEF *keyinfo,
   }
   memcpy(info->lastkey,lastkey,info->lastkey_length);
   info->lastpos=_mi_dpos(info,0,info->lastkey+info->lastkey_length);
-  DBUG_PRINT("exit",("found key at %d",info->lastpos));
+  DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos));
   DBUG_RETURN(0);
 } /* _mi_search_next */
 
@@ -1318,7 +1318,7 @@ int _mi_search_first(register MI_INFO *info, register MI_KEYDEF *keyinfo,
   info->page_changed=info->buff_used=0;
   info->lastpos=_mi_dpos(info,0,info->lastkey+info->lastkey_length);
 
-  DBUG_PRINT("exit",("found key at %d",info->lastpos));
+  DBUG_PRINT("exit",("found key at %ld",(ulong) info->lastpos));
   DBUG_RETURN(0);
 } /* _mi_search_first */
 
@@ -1362,7 +1362,7 @@ int _mi_search_last(register MI_INFO *info, register MI_KEYDEF *keyinfo,
   info->last_search_keypage=info->last_keypage;
   info->page_changed=info->buff_used=0;
 
-  DBUG_PRINT("exit",("found key at %d",info->lastpos));
+  DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos));
   DBUG_RETURN(0);
 } /* _mi_search_last */
 
-- 
cgit v1.2.1