diff options
author | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 21:56:03 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 21:56:03 +0200 |
commit | 25226de9ea52d06667c2c7fbd99f5cd014764241 (patch) | |
tree | 0a9f9390874c91b9e4430fecfbbffa72967e7b69 /cmd-line-utils/readline | |
parent | 7191e775394db0392b78b07e2662c766eeace59c (diff) | |
download | mariadb-git-25226de9ea52d06667c2c7fbd99f5cd014764241.tar.gz |
Fixed compiler warnings
Don't assert if my_thread_end() is called twice (common case)
client/mysql.cc:
Removed not used variables
client/mysqldump.c:
Fixed compiler warnings
client/mysqltest.c:
Fixed compiler warnings
cmd-line-utils/readline/bind.c:
Fixed compiler warnings
cmd-line-utils/readline/histfile.c:
Fixed compiler warnings
extra/replace.c:
Fixed compiler warning on windows
extra/yassl/taocrypt/include/algebra.hpp:
Fixed compiler warnings
heap/hp_write.c:
Fixed compiler warnings
innobase/os/os0file.c:
Fixed compiler warnings
libmysql/libmysql.c:
Call my_end()/my_thread_end last.
my_end() calls free_charsets(), which allowed me to move the call
myisam/myisampack.c:
Fixed compiler warnings
myisammrg/myrg_rkey.c:
Fixed compiler warnings
mysys/my_thr_init.c:
More comments
Don't assert if my_thread_end() is called twice (common case)
ndb/src/mgmapi/mgmapi.cpp:
Fixed compiler warnings
ndb/src/ndbapi/Ndb.cpp:
Fixed compiler warnings
ndb/src/ndbapi/NdbScanOperation.cpp:
Fixed compiler warnings
ndb/src/ndbapi/NdbTransaction.cpp:
Fixed compiler warnings
ndb/src/ndbapi/Ndblist.cpp:
Fixed compiler warnings
server-tools/instance-manager/guardian.cc:
Removed not used variable
server-tools/instance-manager/portability.h:
Removed duplicated symbol
sql/gen_lex_hash.cc:
Fixed compiler warning
sql/ha_archive.cc:
Fixed compiler warnings
sql/ha_ndbcluster.cc:
Fixed compiler warnings
sql/mysqld.cc:
Fixed compiler warnings
sql/sql_cache.cc:
Fixed compiler warnings
Fixed DBUG_PRINT strings to be consistent with 5.1
sql/tztime.cc:
Fixed compiler warnings
sql/uniques.cc:
Fixed compiler warnings
Diffstat (limited to 'cmd-line-utils/readline')
-rw-r--r-- | cmd-line-utils/readline/bind.c | 4 | ||||
-rw-r--r-- | cmd-line-utils/readline/histfile.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index ab1136c7da5..568c3e8776a 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -337,6 +337,7 @@ rl_generic_bind (type, keyseq, data, map) KEYMAP_ENTRY k; k.function = 0; + k.type= 0; /* If no keys to bind to, exit right away. */ if (!keyseq || !*keyseq) @@ -735,7 +736,8 @@ _rl_read_file (filename, sizep) 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) { if (file >= 0) close (file); diff --git a/cmd-line-utils/readline/histfile.c b/cmd-line-utils/readline/histfile.c index 7d340b346d4..a7d6a68098e 100644 --- a/cmd-line-utils/readline/histfile.c +++ b/cmd-line-utils/readline/histfile.c @@ -184,7 +184,8 @@ read_history_range (filename, from, to) 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) { errno = overflow_errno; goto error_and_exit; |