Commit d6237b89 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/50-release 

into  siva.hindu.god:/usr/home/tim/m/bk/50-build
parents cf31ba3c 29aae170

cmd-line-utils/readline/histfile.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

sql/udf_example.c

+1 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ my_bool is_const_init(UDF_INIT *initid, UDF_ARGS *args, char *message) 
    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;

}

strings/decimal.c

+1 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ int decimal2double(decimal_t *from, double *to) 


  *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;

}