bk commit into 5.0 tree (tsmith:1.2356)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-19 20:17:33-07:00, tsmith@stripped +3 -0
  Remove warnings by casting

  cmd-line-utils/readline/histfile.c@stripped, 2006-12-19 20:17:30-07:00, tsmith@stripped +2 -1
    Remove warning (compare signed & unsigned)

  sql/udf_example.c@stripped, 2006-12-19 20:17:30-07:00, tsmith@stripped +1 -1
    Remove warning (cast integer to pointer of different size)

  strings/decimal.c@stripped, 2006-12-19 20:17:30-07:00, tsmith@stripped +1 -1
    Remove warning (%lx format, double arg)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/50-release

--- 1.10/cmd-line-utils/readline/histfile.c	2006-12-19 20:17:41 -07:00
+++ 1.11/cmd-line-utils/readline/histfile.c	2006-12-19 20:17:41 -07:00
@@ -334,7 +334,8 @@ history_truncate_file (fname, lines)
   file_size = (size_t)finfo.st_size;
 
   /* check for overflow on very large files */
-  if (file_size != finfo.st_size || file_size + 1 < file_size)
+  if ((long long) file_size != (long long) finfo.st_size ||
+      file_size + 1 < file_size)
     {
       close (file);
 #if defined (EFBIG)

--- 1.32/sql/udf_example.c	2006-12-19 20:17:41 -07:00
+++ 1.33/sql/udf_example.c	2006-12-19 20:17:41 -07:00
@@ -1087,7 +1087,7 @@ my_bool is_const_init(UDF_INIT *initid, 
     strmov(message, "IS_CONST accepts only one argument");
     return 1;
   }
-  initid->ptr= (char*)((args->args[0] != NULL) ? 1 : 0);
+  initid->ptr= (char*)((args->args[0] != NULL) ? 1UL : 0);
   return 0;
 }
 

--- 1.73/strings/decimal.c	2006-12-19 20:17:41 -07:00
+++ 1.74/strings/decimal.c	2006-12-19 20:17:41 -07:00
@@ -971,7 +971,7 @@ int decimal2double(decimal_t *from, doub
 
   *to= from->sign ? -result : result;
 
-  DBUG_PRINT("info", ("result: %f (%lx)", *to, *to));
+  DBUG_PRINT("info", ("result: %f (%lx)", *to, *(ulong *)to));
 
   return E_DEC_OK;
 }