merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
myisam/mi_search.c:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 4 insertions, 4 deletions

diff --git a/myisam/mi_search.c b/myisam/mi_search.c
index 972f7fc5093..1db8c2a8b67 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));
@@ -1478,7 +1478,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 */
 
@@ -1520,7 +1520,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 */
 
@@ -1564,7 +1564,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 */