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 /myisammrg | |
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 'myisammrg')
-rw-r--r-- | myisammrg/myrg_rkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c index f87b264081e..85464374d5d 100644 --- a/myisammrg/myrg_rkey.c +++ b/myisammrg/myrg_rkey.c @@ -88,7 +88,7 @@ int myrg_rkey(MYRG_INFO *info,byte *buf,int inx, const byte *key, mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table; mi->once_flags|= RRND_PRESERVE_LASTINX; DBUG_PRINT("info", ("using table no: %d", - info->current_table - info->open_tables + 1)); + (int) (info->current_table - info->open_tables + 1))); DBUG_DUMP("result key", (byte*) mi->lastkey, mi->lastkey_length); DBUG_RETURN(_myrg_mi_read_record(mi,buf)); } |