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 /sql/uniques.cc | |
| 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 'sql/uniques.cc')
| -rw-r--r-- | sql/uniques.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/uniques.cc b/sql/uniques.cc index c0343c0c085..c7bdbdeb207 100644 --- a/sql/uniques.cc +++ b/sql/uniques.cc @@ -428,8 +428,8 @@ static bool merge_walk(uchar *merge_buffer, ulong merge_buffer_size, BUFFPEK_COMPARE_CONTEXT compare_context = { compare, compare_arg }; QUEUE queue; if (end <= begin || - merge_buffer_size < key_length * (end - begin + 1) || - init_queue(&queue, end - begin, offsetof(BUFFPEK, key), 0, + merge_buffer_size < (ulong) (key_length * (end - begin + 1)) || + init_queue(&queue, (uint) (end - begin), offsetof(BUFFPEK, key), 0, buffpek_compare, &compare_context)) return 1; /* we need space for one key when a piece of merge buffer is re-read */ |