diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-19 20:23:34 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-19 20:23:34 -0700 |
| commit | d6237b895a2d07a511995f66690e32c3b366d3cf (patch) | |
| tree | 837323f451b65b91251cf0fe7045ef1857d3a123 | |
| parent | cf31ba3c54bf2d6a757d5cdf264fcac49343e7e2 (diff) | |
| parent | 29aae170443d7bbc6dff1b6dd868ed7ea719eec3 (diff) | |
| download | mariadb-git-d6237b895a2d07a511995f66690e32c3b366d3cf.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/50-release
into siva.hindu.god:/usr/home/tim/m/bk/50-build
| -rw-r--r-- | cmd-line-utils/readline/histfile.c | 3 | ||||
| -rw-r--r-- | sql/udf_example.c | 2 | ||||
| -rw-r--r-- | strings/decimal.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/histfile.c b/cmd-line-utils/readline/histfile.c index a7d6a68098e..f1822b105a4 100644 --- a/cmd-line-utils/readline/histfile.c +++ b/cmd-line-utils/readline/histfile.c @@ -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) diff --git a/sql/udf_example.c b/sql/udf_example.c index bbab47e253d..f938cc9c1d3 100644 --- a/sql/udf_example.c +++ b/sql/udf_example.c @@ -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; } diff --git a/strings/decimal.c b/strings/decimal.c index bdc3b1eef42..f6ac4717a32 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -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; } |