| List: | Commits | « Previous MessageNext Message » | |
| From: | Ignacio Galarza | Date: | April 9 2008 6:45pm |
| Subject: | bk commit into 5.0 tree (iggy:1.2613) BUG#29125 | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of iggy. When iggy does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2008-04-09 12:44:53-04:00, iggy@amd64.(none) +112 -0 Bug#29125 Windows Server X64: so many compiler warnings - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. BitKeeper/etc/ignore@stripped, 2008-04-09 12:43:33-04:00, iggy@amd64.(none) +1 -0 Bug#29125 Windows Server X64: so many compiler warnings - Ignore relwithdebinfo binaries. client/mysql.cc@stripped, 2008-04-09 12:43:33-04:00, iggy@amd64.(none) +4 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length client/mysql_upgrade.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length client/mysqladmin.cc@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length client/mysqlbinlog.cc@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +8 -8 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length client/mysqlcheck.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +5 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length client/mysqldump.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +16 -14 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length client/mysqltest.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +40 -38 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length client/sql_string.cc@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/comp_err.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/src/buffer.cpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/src/cert_wrapper.cpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +7 -7 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/src/ssl.cpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/src/yassl_imp.cpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/src/yassl_int.cpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +6 -6 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/taocrypt/include/block.hpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/taocrypt/src/algebra.cpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/taocrypt/src/asn.cpp@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/taocrypt/taocrypt.vcproj@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +269 -111 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length extra/yassl/yassl.vcproj@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +235 -120 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length heap/hp_write.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length include/my_sys.h@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length innobase/include/pars0pars.h@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length innobase/pars/pars0pars.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length innobase/rem/rem0cmp.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length libmysql/libmysql.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length libmysql/manager.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length myisam/mi_check.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length myisam/mi_open.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +3 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length myisam/mi_packrec.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length myisam/mi_search.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length myisam/rt_index.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +5 -5 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length mysys/base64.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length mysys/default.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length mysys/mf_iocache2.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length mysys/my_static.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length mysys/safemalloc.c@stripped, 2008-04-09 12:43:34-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length mysys/string.c@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/buffer.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/commands.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +9 -9 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/instance.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/instance_map.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/instance_options.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +4 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/listener.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +30 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/mysql_connection.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/mysqlmanager.vcproj@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +449 -248 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/options.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/parse.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/parse.h@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/parse_output.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +4 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/protocol.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +6 -6 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length server-tools/instance-manager/user_map.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql-common/client.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql-common/my_user.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/gen_lex_hash.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/ha_archive.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/ha_federated.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +15 -15 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/ha_innodb.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/handler.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +4 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/item.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/item_func.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/item_strfunc.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +7 -7 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/item_strfunc.h@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/item_timefunc.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +32 -32 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/lock.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/log.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/log_event.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +18 -18 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/mysqld.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +4 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/net_serv.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/opt_range.cc@stripped, 2008-04-09 12:43:35-04:00, iggy@amd64.(none) +23 -23 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/opt_sum.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/parse_file.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +5 -5 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/protocol.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +3 -3 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/set_var.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +8 -8 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/slave.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +7 -7 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sp.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +10 -10 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sp_head.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +8 -8 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/spatial.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_acl.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +35 -35 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_base.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +5 -5 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_cache.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +5 -5 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_crypt.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_db.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +9 -9 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_derived.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_error.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_handler.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +8 -8 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_help.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +5 -5 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_insert.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_lex.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_load.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_parse.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +20 -20 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_prepare.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +4 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_repl.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +4 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_select.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +20 -20 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_show.cc@stripped, 2008-04-09 12:43:36-04:00, iggy@amd64.(none) +81 -81 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_string.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_table.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +4 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_trigger.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +18 -18 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_udf.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/sql_view.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +8 -8 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/table.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +4 -4 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/udf_example.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/uniques.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length sql/unireg.cc@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length strings/ctype-mb.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length strings/ctype-simple.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +5 -5 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length strings/ctype-ucs2.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length strings/my_vsnprintf.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length strings/xml.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length tests/bug25714.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +2 -2 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length tests/mysql_client_test.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +174 -174 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length vio/viosocket.c@stripped, 2008-04-09 12:43:37-04:00, iggy@amd64.(none) +1 -1 Bug#29125 Windows Server X64: so many compiler warnings - Strings are guaranteed to be max uint in length diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore --- a/BitKeeper/etc/ignore 2007-11-26 15:27:59 -05:00 +++ b/BitKeeper/etc/ignore 2008-04-09 12:43:33 -04:00 @@ -39,6 +39,7 @@ */.pure */debug/* */release/* +*/relwithdebinfo/* *~ .*.swp ./CMakeCache.txt diff -Nrup a/client/mysql.cc b/client/mysql.cc --- a/client/mysql.cc 2008-03-28 14:02:22 -04:00 +++ b/client/mysql.cc 2008-04-09 12:43:33 -04:00 @@ -1226,7 +1226,7 @@ sig_handler mysql_sigint(int sig) goto err; /* kill_buffer is always big enough because max length of %lu is 15 */ sprintf(kill_buffer, "KILL /*!50000 QUERY */ %lu", mysql_thread_id(&mysql)); - mysql_real_query(kill_mysql, kill_buffer, strlen(kill_buffer)); + mysql_real_query(kill_mysql, kill_buffer, (uint) strlen(kill_buffer)); mysql_close(kill_mysql); tee_fprintf(stdout, "Query aborted by Ctrl+C\n"); @@ -3455,7 +3455,7 @@ static void print_warnings() /* Get the warnings */ query= "show warnings"; - mysql_real_query_for_lazy(query, strlen(query)); + mysql_real_query_for_lazy(query, (uint) strlen(query)); mysql_store_result_for_lazy(&result); /* Bail out when no warnings */ @@ -4335,7 +4335,8 @@ server_version_string(MYSQL *con) MYSQL_ROW cur = mysql_fetch_row(result); if (cur && cur[0]) { - bufp = strxnmov(bufp, sizeof buf - (bufp - buf), " ", cur[0], NullS); + bufp = strxnmov(bufp, (uint) (sizeof buf - (bufp - buf)), " ", cur[0], + NullS); } mysql_free_result(result); } diff -Nrup a/client/mysql_upgrade.c b/client/mysql_upgrade.c --- a/client/mysql_upgrade.c 2007-10-08 22:30:39 -04:00 +++ b/client/mysql_upgrade.c 2008-04-09 12:43:34 -04:00 @@ -454,7 +454,7 @@ static int run_query(const char *query, MYF(MY_WME))) < 0) die("Failed to create temporary file for defaults"); - if (my_write(fd, query, strlen(query), + if (my_write(fd, query, (uint) strlen(query), MYF(MY_FNABP | MY_WME))) { my_close(fd, MYF(0)); diff -Nrup a/client/mysqladmin.cc b/client/mysqladmin.cc --- a/client/mysqladmin.cc 2007-09-13 10:19:43 -04:00 +++ b/client/mysqladmin.cc 2008-04-09 12:43:34 -04:00 @@ -844,7 +844,7 @@ static int execute_commands(MYSQL *mysql bool old= (find_type(argv[0], &command_typelib, 2) == ADMIN_OLD_PASSWORD); #ifdef __WIN__ - uint pw_len= strlen(pw); + uint pw_len= (uint) strlen(pw); if (pw_len > 1 && pw[0] == '\'' && pw[pw_len-1] == '\'') printf("Warning: single quotes were not trimmed from the password by" " your command\nline client, as you might have expected.\n"); diff -Nrup a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc --- a/client/mysqlbinlog.cc 2008-02-06 14:55:11 -05:00 +++ b/client/mysqlbinlog.cc 2008-04-09 12:43:34 -04:00 @@ -105,7 +105,7 @@ static MYSQL* safe_connect(); class Load_log_processor { char target_dir_name[FN_REFLEN]; - int target_dir_name_len; + size_t target_dir_name_len; /* When we see first event corresponding to some LOAD DATA statement in @@ -275,7 +275,7 @@ File Load_log_processor::prepare_new_fil File file; fn_format(filename, le->fname, target_dir_name, "", 1); - len= strlen(filename); + len= (uint) strlen(filename); tail= filename + len; if ((file= create_unique_file(filename,tail)) < 0) @@ -284,7 +284,7 @@ File Load_log_processor::prepare_new_fil return -1; } - le->set_fname_outside_temp_buf(filename,len+strlen(tail)); + le->set_fname_outside_temp_buf(filename,len+(uint) strlen(tail)); return file; } @@ -369,7 +369,7 @@ int Load_log_processor::process_first_ev uint file_id, Create_file_log_event *ce) { - uint full_len= target_dir_name_len + blen + 9 + 9 + 1; + size_t full_len= target_dir_name_len + blen + 9 + 9 + 1; int error= 0; char *fname, *ptr; File file; @@ -403,7 +403,7 @@ int Load_log_processor::process_first_ev } if (ce) - ce->set_fname_outside_temp_buf(fname, strlen(fname)); + ce->set_fname_outside_temp_buf(fname, (uint) strlen(fname)); if (my_write(file, (byte*)block, block_len, MYF(MY_WME|MY_NABP))) error= -1; @@ -416,7 +416,7 @@ int Load_log_processor::process_first_ev int Load_log_processor::process(Create_file_log_event *ce) { const char *bname= ce->fname + dirname_length(ce->fname); - uint blen= ce->fname_len - (bname-ce->fname); + uint blen= (uint) (ce->fname_len - (bname-ce->fname)); return process_first_event(bname, blen, ce->block, ce->block_len, ce->file_id, ce); @@ -864,7 +864,7 @@ static my_time_t convert_str_to_timestam long dummy_my_timezone; my_bool dummy_in_dst_time_gap; /* We require a total specification (date AND time) */ - if (str_to_datetime(str, strlen(str), &l_time, 0, &was_cut) != + if (str_to_datetime(str, (uint) strlen(str), &l_time, 0, &was_cut) != MYSQL_TIMESTAMP_DATETIME || was_cut) { fprintf(stderr, "Incorrect date and time argument: %s\n", str); @@ -1109,7 +1109,7 @@ could be out of memory"); int4store(buf, (uint32)start_position); int2store(buf + BIN_LOG_HEADER_SIZE, binlog_flags); - size_s tlen = strlen(logname); + size_t tlen= strlen(logname); if (tlen > UINT_MAX) { fprintf(stderr,"Log name too long\n"); diff -Nrup a/client/mysqlcheck.c b/client/mysqlcheck.c --- a/client/mysqlcheck.c 2008-01-23 11:37:44 -05:00 +++ b/client/mysqlcheck.c 2008-04-09 12:43:34 -04:00 @@ -328,7 +328,7 @@ static int get_options(int *argc, char * if (!what_to_do) { - int pnlen = strlen(my_progname); + size_t pnlen= strlen(my_progname); if (pnlen < 6) /* name too short */ what_to_do = DO_CHECK; @@ -414,7 +414,8 @@ static int process_selected_tables(char space is for more readable output in logs and in case of error */ char *table_names_comma_sep, *end; - int i, tot_length = 0; + size_t tot_length= 0; + int i= 0; for (i = 0; i < tables; i++) tot_length+= fixed_name_length(*(table_names + i)) + 2; @@ -430,7 +431,7 @@ static int process_selected_tables(char *end++= ','; } *--end = 0; - handle_request_for_tables(table_names_comma_sep + 1, tot_length - 1); + handle_request_for_tables(table_names_comma_sep + 1, (uint) (tot_length - 1)); my_free(table_names_comma_sep, MYF(0)); } else @@ -452,7 +453,7 @@ static uint fixed_name_length(const char else if (*p == '.') extra_length+= 2; } - return (p - name) + extra_length; + return (uint) ((p - name) + extra_length); } diff -Nrup a/client/mysqldump.c b/client/mysqldump.c --- a/client/mysqldump.c 2008-03-14 09:31:55 -04:00 +++ b/client/mysqldump.c 2008-04-09 12:43:34 -04:00 @@ -662,7 +662,7 @@ static void free_table_ent(char *key) byte* get_table_key(const char *entry, uint *length, my_bool not_used __attribute__((unused))) { - *length= strlen(entry); + *length= (uint) strlen(entry); return (byte*) entry; } @@ -778,7 +778,7 @@ get_one_option(int optid, const struct m opt_set_charset= 0; opt_compatible_mode_str= argument; opt_compatible_mode= find_set(&compatible_mode_typelib, - argument, strlen(argument), + argument, (uint) strlen(argument), &err_ptr, &err_len); if (err_len) { @@ -791,7 +791,7 @@ get_one_option(int optid, const struct m uint size_for_sql_mode= 0; const char **ptr; for (ptr= compatible_mode_names; *ptr; ptr++) - size_for_sql_mode+= strlen(*ptr); + size_for_sql_mode+= (uint) strlen(*ptr); size_for_sql_mode+= sizeof(compatible_mode_names)-1; DBUG_ASSERT(sizeof(compatible_mode_normal_str)>=size_for_sql_mode); } @@ -1039,7 +1039,7 @@ static int switch_character_set_results( "SET SESSION character_set_results = '%s'", (const char *) cs_name); - return mysql_real_query(mysql, query_buffer, query_length); + return mysql_real_query(mysql, query_buffer, (uint) query_length); } @@ -1371,7 +1371,8 @@ static void print_xml_tag(FILE * xml_fil fputs(attribute_name, xml_file); fputc('\"', xml_file); - print_quoted_xml(xml_file, attribute_value, strlen(attribute_value)); + print_quoted_xml(xml_file, attribute_value, + (uint) strlen(attribute_value)); fputc('\"', xml_file); attribute_name= va_arg(arg_list, char *); @@ -1411,7 +1412,7 @@ static void print_xml_null_tag(FILE * xm fputs("<", xml_file); fputs(stag_atr, xml_file); fputs("\"", xml_file); - print_quoted_xml(xml_file, sval, strlen(sval)); + print_quoted_xml(xml_file, sval, (uint) strlen(sval)); fputs("\" xsi:nil=\"true\" />", xml_file); fputs(line_end, xml_file); check_io(xml_file); @@ -1509,7 +1510,7 @@ static uint dump_routines_for_db(char *d DBUG_ENTER("dump_routines_for_db"); DBUG_PRINT("enter", ("db: '%s'", db)); - mysql_real_escape_string(mysql, db_name_buff, db, strlen(db)); + mysql_real_escape_string(mysql, db_name_buff, db, (uint) strlen(db)); /* nice comments */ if (opt_comments) @@ -1601,13 +1602,13 @@ static uint dump_routines_for_db(char *d Allocate memory for new query string: original string from SHOW statement and version-specific comments. */ - query_str= alloc_query_str(strlen(row[2]) + 23); + query_str= alloc_query_str((uint) strlen(row[2]) + 23); query_str_tail= strnmov(query_str, row[2], - definer_begin - row[2]); + (uint) (definer_begin - row[2])); query_str_tail= strmov(query_str_tail, "*/ /*!50020"); query_str_tail= strnmov(query_str_tail, definer_begin, - definer_end - definer_begin); + (uint) (definer_end - definer_begin)); query_str_tail= strxmov(query_str_tail, "*/ /*!50003", definer_end, NullS); } @@ -2210,7 +2211,7 @@ static void dump_triggers_for_table(char char host_name_str[HOSTNAME_LENGTH + 1]; char quoted_host_name_str[HOSTNAME_LENGTH * 2 + 3]; - parse_user(row[7], strlen(row[7]), user_name_str, &user_name_len, + parse_user(row[7], (uint) strlen(row[7]), user_name_str, &user_name_len, host_name_str, &host_name_len); fprintf(sql_file, @@ -3048,7 +3049,7 @@ static int dump_all_tables_in_db(char *d while ((table= getTableName(0))) { char *end= strmov(afterdot, table); - if (include_table(hash_key, end - hash_key)) + if (include_table(hash_key, (uint) (end - hash_key))) { dump_table(table,database); my_free(order_by, MYF(MY_ALLOW_ZERO_PTR)); @@ -3616,7 +3617,7 @@ static char *primary_key_fields(const ch do { quoted_field= quote_name(row[4], buff, 0); - result_length+= strlen(quoted_field) + 1; /* + 1 for ',' or \0 */ + result_length+= (uint) strlen(quoted_field) + 1; /* + 1 for ',' or \0 */ } while ((row= mysql_fetch_row(res)) && atoi(row[3]) > 1); } @@ -3676,7 +3677,8 @@ static int replace(DYNAMIC_STRING *ds_st return 1; init_dynamic_string_checked(&ds_tmp, "", ds_str->length + replace_len, 256); - dynstr_append_mem_checked(&ds_tmp, ds_str->str, start - ds_str->str); + dynstr_append_mem_checked(&ds_tmp, ds_str->str, + (uint) (start - ds_str->str)); dynstr_append_mem_checked(&ds_tmp, replace_str, replace_len); dynstr_append_checked(&ds_tmp, start + search_len); dynstr_set_checked(ds_str, ds_tmp.str); diff -Nrup a/client/mysqltest.c b/client/mysqltest.c --- a/client/mysqltest.c 2008-03-23 13:53:33 -04:00 +++ b/client/mysqltest.c 2008-04-09 12:43:34 -04:00 @@ -801,7 +801,7 @@ void check_command_args(struct st_comman ptr++; if (ptr > start) { - init_dynamic_string(arg->ds, 0, ptr-start, 32); + init_dynamic_string(arg->ds, 0, (uint) (ptr - start), 32); do_eval(arg->ds, start, ptr, FALSE); } else @@ -1156,16 +1156,16 @@ void warning_msg(const char *fmt, ...) len= my_snprintf(buff, sizeof(buff), "in included file %s ", cur_file->file_name); dynstr_append_mem(&ds_warning_messages, - buff, len); + buff, (uint) len); } len= my_snprintf(buff, sizeof(buff), "at line %d: ", start_lineno); dynstr_append_mem(&ds_warning_messages, - buff, len); + buff, (uint) len); } len= my_vsnprintf(buff, sizeof(buff), fmt, args); - dynstr_append_mem(&ds_warning_messages, buff, len); + dynstr_append_mem(&ds_warning_messages, buff, (uint) len); dynstr_append(&ds_warning_messages, "\n"); va_end(args); @@ -1185,7 +1185,7 @@ void log_msg(const char *fmt, ...) len= my_vsnprintf(buff, sizeof(buff)-1, fmt, args); va_end(args); - dynstr_append_mem(&ds_res, buff, len); + dynstr_append_mem(&ds_res, buff, (uint) len); dynstr_append(&ds_res, "\n"); DBUG_VOID_RETURN; @@ -1222,7 +1222,7 @@ void cat_file(DYNAMIC_STRING* ds, const /* Add fake newline instead of cr and output the line */ *p= '\n'; p++; /* Step past the "fake" newline */ - dynstr_append_mem(ds, start, p-start); + dynstr_append_mem(ds, start, (uint) (p - start)); p++; /* Step past the "fake" newline */ start= p; } @@ -1230,7 +1230,7 @@ void cat_file(DYNAMIC_STRING* ds, const p++; } /* Output any chars that migh be left */ - dynstr_append_mem(ds, start, p-start); + dynstr_append_mem(ds, start, (uint) (p - start)); } my_close(fd, MYF(0)); } @@ -1718,9 +1718,9 @@ VAR *var_init(VAR *v, const char *name, int val_alloc_len; VAR *tmp_var; if (!name_len && name) - name_len = strlen(name); + name_len = (uint) strlen(name); if (!val_len && val) - val_len = strlen(val) ; + val_len = (uint) strlen(val) ; val_alloc_len = val_len + 16; /* room to grow */ if (!(tmp_var=v) && !(tmp_var = (VAR*)my_malloc(sizeof(*tmp_var) + name_len+1, MYF(MY_WME)))) @@ -1763,7 +1763,7 @@ VAR* var_from_env(const char *name, cons if (!(tmp = getenv(name))) tmp = def_val; - v = var_init(0, name, strlen(name), tmp, strlen(tmp)); + v = var_init(0, name, (uint) strlen(name), tmp, (uint) strlen(tmp)); my_hash_insert(&var_hash, (byte*)v); return v; } @@ -1812,7 +1812,7 @@ VAR* var_get(const char *var_name, const { sprintf(v->str_val, "%d", v->int_val); v->int_dirty = 0; - v->str_val_len = strlen(v->str_val); + v->str_val_len = (uint) strlen(v->str_val); } if (var_name_end) *var_name_end = var_name ; @@ -1875,7 +1875,7 @@ void var_set(const char *var_name, const { sprintf(v->str_val, "%d", v->int_val); v->int_dirty= 0; - v->str_val_len= strlen(v->str_val); + v->str_val_len= (uint) strlen(v->str_val); } my_snprintf(buf, sizeof(buf), "%.*s=%.*s", v->name_len, v->name, @@ -1954,7 +1954,7 @@ void var_query_set(VAR *var, const char ++query; /* Eval the query, thus replacing all environment variables */ - init_dynamic_string(&ds_query, 0, (end - query) + 32, 256); + init_dynamic_string(&ds_query, 0, (uint) ((end - query) + 32), 256); do_eval(&ds_query, query, end, FALSE); if (mysql_real_query(mysql, ds_query.str, ds_query.length)) @@ -2171,7 +2171,7 @@ void eval_expr(VAR *v, const char *p, co struct st_command command; memset(&command, 0, sizeof(command)); command.query= (char*)p; - command.first_word_len= len; + command.first_word_len= (uint) len; command.first_argument= command.query + len; command.end= (char*)*p_end; var_set_query_get_value(&command, v); @@ -2361,7 +2361,7 @@ static int replace(DYNAMIC_STRING *ds_st return 1; init_dynamic_string(&ds_tmp, "", ds_str->length + replace_len, 256); - dynstr_append_mem(&ds_tmp, ds_str->str, start - ds_str->str); + dynstr_append_mem(&ds_tmp, ds_str->str, (uint) (start - ds_str->str)); dynstr_append_mem(&ds_tmp, replace_str, replace_len); dynstr_append(&ds_tmp, start + search_len); dynstr_set(ds_str, ds_tmp.str); @@ -2416,7 +2416,7 @@ void do_exec(struct st_command *command) if (builtin_echo[0] && strncmp(cmd, "echo", 4) == 0) { /* Replace echo with our "builtin" echo */ - replace(&ds_cmd, "echo", 4, builtin_echo, strlen(builtin_echo)); + replace(&ds_cmd, "echo", 4, builtin_echo, (uint) strlen(builtin_echo)); } #ifdef __WIN__ @@ -4575,7 +4575,7 @@ void do_delimiter(struct st_command* com die("Can't set empty delimiter"); strmake(delimiter, p, sizeof(delimiter) - 1); - delimiter_length= strlen(delimiter); + delimiter_length= (uint) strlen(delimiter); DBUG_PRINT("exit", ("delimiter: %s", delimiter)); command->last_argument= p + delimiter_length; @@ -4701,9 +4701,11 @@ int read_line(char *buf, int size) } else if ((c == '{' && (!my_strnncoll_simple(charset_info, (const uchar*) "while", 5, - (uchar*) buf, min(5, p - buf), 0) || + (uchar*) buf, min(5, (uint) (p - buf)), + 0) || !my_strnncoll_simple(charset_info, (const uchar*) "if", 2, - (uchar*) buf, min(2, p - buf), 0)))) + (uchar*) buf, min(2, (uint) (p - buf)), + 0)))) { /* Only if and while commands can be terminated by { */ *p++= c; @@ -5065,7 +5067,7 @@ int read_command(struct st_command** com command->first_argument= p; command->end= strend(command->query); - command->query_len= (command->end - command->query); + command->query_len= (uint) (command->end - command->query); parser.read_lines++; DBUG_RETURN(0); } @@ -6406,7 +6408,7 @@ void run_query(struct st_connection *cn, else { query = command->query; - query_len = strlen(query); + query_len = (uint) strlen(query); } /* @@ -6467,7 +6469,7 @@ void run_query(struct st_connection *cn, */ view_created= 1; query= (char*)"SELECT * FROM mysqltest_tmp_v"; - query_len = strlen(query); + query_len = (uint) strlen(query); /* Collect warnings from create of the view that should otherwise @@ -6515,7 +6517,7 @@ void run_query(struct st_connection *cn, sp_created= 1; query= (char*)"CALL mysqltest_tmp_sp()"; - query_len = strlen(query); + query_len = (uint) strlen(query); } dynstr_free(&query_str); } @@ -6608,7 +6610,7 @@ void init_re_comp(my_regex_t *re, const if (err) { char erbuf[100]; - int len= my_regerror(err, re, erbuf, sizeof(erbuf)); + size_t len= my_regerror(err, re, erbuf, sizeof(erbuf)); die("error %s, %d/%d `%s'\n", re_eprint(err), len, (int)sizeof(erbuf), erbuf); } @@ -6664,7 +6666,7 @@ int match_re(my_regex_t *re, char *str) { char erbuf[100]; - int len= my_regerror(err, re, erbuf, sizeof(erbuf)); + size_t len= my_regerror(err, re, erbuf, sizeof(erbuf)); die("error %s, %d/%d `%s'\n", re_eprint(err), len, (int)sizeof(erbuf), erbuf); } @@ -7526,7 +7528,7 @@ void replace_strings_append(REPLACE *rep if (!(rep_str = ((REPLACE_STRING*) rep_pos))->replace_string) { /* No match found */ - dynstr_append_mem(ds, start, from - start - 1); + dynstr_append_mem(ds, start, (uint) (from - start - 1)); DBUG_PRINT("exit", ("Found no more string to replace, appended: %s", start)); DBUG_VOID_RETURN; } @@ -7537,11 +7539,11 @@ void replace_strings_append(REPLACE *rep rep_str->from_offset, rep_str->replace_string)); /* Append part of original string before replace string */ - dynstr_append_mem(ds, start, (from - rep_str->to_offset) - start); + dynstr_append_mem(ds, start, (uint) ((from - rep_str->to_offset) - start)); /* Append replace string */ dynstr_append_mem(ds, rep_str->replace_string, - strlen(rep_str->replace_string)); + (uint) strlen(rep_str->replace_string)); if (!*(from-=rep_str->from_offset) && rep_pos->found != 2) { @@ -7636,7 +7638,7 @@ struct st_replace_regex* init_replace_re char* buf,*expr_end; char* p; char* buf_p; - uint expr_len= strlen(expr); + size_t expr_len= strlen(expr); char last_c = 0; struct st_regex reg; @@ -7813,7 +7815,7 @@ void free_replace_regex() */ #define SECURE_REG_BUF if (buf_len < need_buf_len) \ { \ - int off= res_p - buf; \ + size_t off= res_p - buf; \ buf= (char*)my_realloc(buf,need_buf_len,MYF(MY_WME+MY_FAE)); \ res_p= buf + off; \ buf_len= need_buf_len; \ @@ -7845,7 +7847,7 @@ int reg_replace(char** buf_p, int* buf_l char *res_p,*str_p,*str_end; buf_len= *buf_len_p; - len= strlen(string); + len= (uint) strlen(string); str_end= string + len; /* start with a buffer of a reasonable size that hopefully will not @@ -7897,7 +7899,7 @@ int reg_replace(char** buf_p, int* buf_l we need at least what we have so far in the buffer + the part before this match */ - need_buf_len= (res_p - buf) + (int) subs[0].rm_so; + need_buf_len= (uint) (res_p - buf) + (int) subs[0].rm_so; /* on this pass, calculate the memory for the result buffer */ while (expr_p < replace_end) @@ -7987,8 +7989,8 @@ int reg_replace(char** buf_p, int* buf_l } else /* no match this time, just copy the string as is */ { - int left_in_str= str_end-str_p; - need_buf_len= (res_p-buf) + left_in_str; + size_t left_in_str= str_end-str_p; + need_buf_len= (uint) ((res_p-buf) + left_in_str); SECURE_REG_BUF memcpy(res_p,str_p,left_in_str); res_p += left_in_str; @@ -8655,7 +8657,7 @@ void replace_dynstr_append_mem(DYNAMIC_S if (!multi_reg_replace(glob_replace_regex, (char*)val)) { val= glob_replace_regex->buf; - len= strlen(val); + len= (uint) strlen(val); } } @@ -8672,7 +8674,7 @@ void replace_dynstr_append_mem(DYNAMIC_S /* Append zero-terminated string to ds, with optional replace */ void replace_dynstr_append(DYNAMIC_STRING *ds, const char *val) { - replace_dynstr_append_mem(ds, val, strlen(val)); + replace_dynstr_append_mem(ds, val, (uint) strlen(val)); } /* Append uint to ds, with optional replace */ @@ -8680,7 +8682,7 @@ void replace_dynstr_append_uint(DYNAMIC_ { char buff[22]; /* This should be enough for any int */ char *end= longlong10_to_str(val, buff, 10); - replace_dynstr_append_mem(ds, buff, end - buff); + replace_dynstr_append_mem(ds, buff, (uint) (end - buff)); } @@ -8718,7 +8720,7 @@ void dynstr_append_sorted(DYNAMIC_STRING while (*start && *start != '\n') start++; start++; /* Skip past \n */ - dynstr_append_mem(ds, ds_input->str, start - ds_input->str); + dynstr_append_mem(ds, ds_input->str, (uint) (start - ds_input->str)); /* Insert line(s) in array */ while (*start) diff -Nrup a/client/sql_string.cc b/client/sql_string.cc --- a/client/sql_string.cc 2007-03-28 13:46:36 -04:00 +++ b/client/sql_string.cc 2008-04-09 12:43:34 -04:00 @@ -468,7 +468,7 @@ bool String::append(const char *s,uint32 bool String::append(const char *s) { - return append(s, strlen(s)); + return append(s, (uint) strlen(s)); } diff -Nrup a/extra/comp_err.c b/extra/comp_err.c --- a/extra/comp_err.c 2007-10-05 13:54:58 -04:00 +++ b/extra/comp_err.c 2008-04-09 12:43:34 -04:00 @@ -660,7 +660,7 @@ static ha_checksum checksum_format_speci case 'u': case 'x': case 's': - chksum= my_checksum(chksum, start, p-start); + chksum= my_checksum(chksum, start, (uint) (p - start)); start= 0; /* Not in format specifier anymore */ break; diff -Nrup a/extra/yassl/src/buffer.cpp b/extra/yassl/src/buffer.cpp --- a/extra/yassl/src/buffer.cpp 2006-07-12 15:15:02 -04:00 +++ b/extra/yassl/src/buffer.cpp 2008-04-09 12:43:34 -04:00 @@ -106,7 +106,7 @@ void input_buffer::add_size(uint i) uint input_buffer::get_capacity() const { - return end_ - buffer_; + return (uint) (end_ - buffer_); } @@ -223,7 +223,7 @@ uint output_buffer::get_size() const uint output_buffer::get_capacity() const { - return end_ - buffer_; + return (uint) (end_ - buffer_); } diff -Nrup a/extra/yassl/src/cert_wrapper.cpp b/extra/yassl/src/cert_wrapper.cpp --- a/extra/yassl/src/cert_wrapper.cpp 2006-08-29 16:06:44 -04:00 +++ b/extra/yassl/src/cert_wrapper.cpp 2008-04-09 12:43:34 -04:00 @@ -236,7 +236,7 @@ uint CertManager::get_privateKeyLength() int CertManager::Validate() { CertList::reverse_iterator last = peerList_.rbegin(); - int count = peerList_.size(); + size_t count= peerList_.size(); while ( count > 1 ) { TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length()); @@ -269,13 +269,13 @@ int CertManager::Validate() else peerKeyType_ = dsa_sa_algo; - int iSz = strlen(cert.GetIssuer()) + 1; - int sSz = strlen(cert.GetCommonName()) + 1; - int bSz = strlen(cert.GetBeforeDate()) + 1; - int aSz = strlen(cert.GetAfterDate()) + 1; + size_t iSz= strlen(cert.GetIssuer()) + 1; + size_t sSz= strlen(cert.GetCommonName()) + 1; + size_t bSz= strlen(cert.GetBeforeDate()) + 1; + size_t aSz= strlen(cert.GetAfterDate()) + 1; peerX509_ = NEW_YS X509(cert.GetIssuer(), iSz, cert.GetCommonName(), - sSz, cert.GetBeforeDate(), bSz, - cert.GetAfterDate(), aSz); + sSz, cert.GetBeforeDate(), (int) bSz, + cert.GetAfterDate(), (int) aSz); } return 0; } diff -Nrup a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp --- a/extra/yassl/src/ssl.cpp 2007-08-28 03:45:26 -04:00 +++ b/extra/yassl/src/ssl.cpp 2008-04-09 12:43:34 -04:00 @@ -604,13 +604,13 @@ char* X509_NAME_oneline(X509_NAME* name, { if (!name->GetName()) return buffer; - int len = strlen(name->GetName()) + 1; - int copySz = min(len, sz); + size_t len= strlen(name->GetName()) + 1; + int copySz = min((int) len, sz); if (!buffer) { buffer = (char*)malloc(len); if (!buffer) return buffer; - copySz = len; + copySz = (int) len; } if (copySz == 0) diff -Nrup a/extra/yassl/src/yassl_imp.cpp b/extra/yassl/src/yassl_imp.cpp --- a/extra/yassl/src/yassl_imp.cpp 2008-01-11 07:08:06 -05:00 +++ b/extra/yassl/src/yassl_imp.cpp 2008-04-09 12:43:34 -04:00 @@ -532,7 +532,7 @@ void Parameters::SetCipherNames() for (int j = 0; j < suites; j++) { int index = suites_[j*2 + 1]; // every other suite is suite id - int len = strlen(cipher_names[index]) + 1; + size_t len = strlen(cipher_names[index]) + 1; strncpy(cipher_list_[pos++], cipher_names[index], len); } cipher_list_[pos][0] = 0; diff -Nrup a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp --- a/extra/yassl/src/yassl_int.cpp 2007-08-20 15:54:45 -04:00 +++ b/extra/yassl/src/yassl_int.cpp 2008-04-09 12:43:34 -04:00 @@ -1034,7 +1034,7 @@ void SSL::fillData(Data& data) { if (GetError()) return; uint dataSz = data.get_length(); // input, data size to fill - uint elements = buffers_.getData().size(); + size_t elements = buffers_.getData().size(); data.set_length(0); // output, actual data filled dataSz = min(dataSz, bufferedData()); @@ -1064,7 +1064,7 @@ void SSL::PeekData(Data& data) { if (GetError()) return; uint dataSz = data.get_length(); // input, data size to fill - uint elements = buffers_.getData().size(); + size_t elements = buffers_.getData().size(); data.set_length(0); // output, actual data filled dataSz = min(dataSz, bufferedData()); @@ -1098,7 +1098,7 @@ void SSL::flushBuffer() buffers_.getHandShake().end(), SumBuffer()).total_; output_buffer out(sz); - uint elements = buffers_.getHandShake().size(); + size_t elements = buffers_.getHandShake().size(); for (uint i = 0; i < elements; i++) { output_buffer* front = buffers_.getHandShake().front(); @@ -1906,7 +1906,7 @@ bool SSL_CTX::SetCipherList(const char* int idx = 0; for(;;) { - int len; + size_t len; prev = haystack; haystack = strstr(haystack, needle); @@ -2354,10 +2354,10 @@ ASN1_STRING* X509_NAME::GetEntry(int i) memcpy(entry_.data, &name_[i], sz_ - i); if (entry_.data[sz_ -i - 1]) { entry_.data[sz_ - i] = 0; - entry_.length = sz_ - i; + entry_.length = (int) (sz_ - i); } else - entry_.length = sz_ - i - 1; + entry_.length = (int) (sz_ - i - 1); entry_.type = 0; return &entry_; diff -Nrup a/extra/yassl/taocrypt/include/block.hpp b/extra/yassl/taocrypt/include/block.hpp --- a/extra/yassl/taocrypt/include/block.hpp 2006-10-04 23:18:12 -04:00 +++ b/extra/yassl/taocrypt/include/block.hpp 2008-04-09 12:43:34 -04:00 @@ -78,7 +78,7 @@ typename A::pointer StdReallocate(A& a, if (preserve) { A b = A(); typename A::pointer newPointer = b.allocate(newSize, 0); - memcpy(newPointer, p, sizeof(T) * min(oldSize, newSize)); + memcpy(newPointer, p, sizeof(T) * min((word32) oldSize, (word32) newSize)); a.deallocate(p, oldSize); STL::swap(a, b); return newPointer; diff -Nrup a/extra/yassl/taocrypt/src/algebra.cpp b/extra/yassl/taocrypt/src/algebra.cpp --- a/extra/yassl/taocrypt/src/algebra.cpp 2007-03-14 22:15:12 -04:00 +++ b/extra/yassl/taocrypt/src/algebra.cpp 2008-04-09 12:43:34 -04:00 @@ -288,7 +288,7 @@ void AbstractGroup::SimultaneousMultiply r = buckets[i][buckets[i].size()-1]; if (buckets[i].size() > 1) { - for (int j = buckets[i].size()-2; j >= 1; j--) + for (int j= (unsigned int) (buckets[i].size()) - 2; j >= 1; j--) { Accumulate(buckets[i][j], buckets[i][j+1]); Accumulate(r, buckets[i][j]); diff -Nrup a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp --- a/extra/yassl/taocrypt/src/asn.cpp 2007-03-14 22:15:16 -04:00 +++ b/extra/yassl/taocrypt/src/asn.cpp 2008-04-09 12:43:34 -04:00 @@ -213,7 +213,7 @@ void PublicKey::AddToEnd(const byte* dat Signer::Signer(const byte* k, word32 kSz, const char* n, const byte* h) : key_(k, kSz) { - int sz = strlen(n); + size_t sz = strlen(n); memcpy(name_, n, sz); name_[sz] = 0; diff -Nrup a/extra/yassl/taocrypt/taocrypt.vcproj b/extra/yassl/taocrypt/taocrypt.vcproj --- a/extra/yassl/taocrypt/taocrypt.vcproj 2007-03-19 11:17:48 -04:00 +++ b/extra/yassl/taocrypt/taocrypt.vcproj 2008-04-09 12:43:34 -04:00 @@ -1,265 +1,423 @@ -<?xml version="1.0" encoding="Windows-1252"?> +<?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="taocrypt" + ProjectGUID="{A91076C0-1CA1-4AD0-AFDE-8D14262155AC}" SccProjectName="" - SccLocalPath=""> + SccLocalPath="" + Keyword="Win32Proj"> <Platforms> <Platform - Name="Win32"/> + Name="x64"/> </Platforms> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory=".\debug_obj" - IntermediateDirectory=".\debug_obj" + Name="Debug|x64" + OutputDirectory="Debug" + IntermediateDirectory="taocrypt.dir\Debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" - Optimization="0" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,mySTL" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - ExceptionHandling="FALSE" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" BasicRuntimeChecks="3" + CompileAs="2" + DebugInformationFormat="3" + ExceptionHandling="FALSE" + InlineFunctionExpansion="0" + Optimization="0" RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\debug_obj/taocrypt.pch" - AssemblerListingLocation=".\debug_obj/" - ObjectFile=".\debug_obj/" - ProgramDataBaseFileName=".\debug_obj/" - BrowseInformation="1" + RuntimeTypeInfo="TRUE" WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4" - CompileAs="0"/> + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"Debug\""" + AssemblerListingLocation="Debug" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/taocrypt/Debug/taocrypt.pdb" +/> <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLibrarianTool" - OutputFile=".\debug_obj\taocrypt.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"Debug\"""/> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"Debug\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\taocrypt.lib"/> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="Release" + IntermediateDirectory="taocrypt.dir\Release" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" + CompileAs="2" + ExceptionHandling="FALSE" + InlineFunctionExpansion="2" + Optimization="2" + RuntimeLibrary="0" + RuntimeTypeInfo="TRUE" + WarningLevel="3" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"Release\""" + AssemblerListingLocation="Release" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/taocrypt/Release/taocrypt.pdb" +/> + <Tool + Name="VCCustomBuildTool"/> + <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"Release\"""/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"Release\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPreLinkEventTool"/> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool"/> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCLibrarianTool" + OutputFile="$(OutDir)\taocrypt.lib"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\release_obj" - IntermediateDirectory=".\release_obj" + Name="MinSizeRel|x64" + OutputDirectory="MinSizeRel" + IntermediateDirectory="taocrypt.dir\MinSizeRel" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,mySTL" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - StringPooling="TRUE" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" + CompileAs="2" ExceptionHandling="FALSE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\release_obj/taocrypt.pch" - AssemblerListingLocation=".\release_obj/" - ObjectFile=".\release_obj/" - ProgramDataBaseFileName=".\release_obj/" + InlineFunctionExpansion="1" + Optimization="1" + RuntimeLibrary="2" + RuntimeTypeInfo="TRUE" WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"MinSizeRel\""" + AssemblerListingLocation="MinSizeRel" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/taocrypt/MinSizeRel/taocrypt.pdb" +/> <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLibrarianTool" - OutputFile=".\release_obj\taocrypt.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"MinSizeRel\"""/> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"MinSizeRel\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\taocrypt.lib"/> + </Configuration> + <Configuration + Name="RelWithDebInfo|x64" + OutputDirectory="RelWithDebInfo" + IntermediateDirectory="taocrypt.dir\RelWithDebInfo" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" + CompileAs="2" + DebugInformationFormat="3" + ExceptionHandling="FALSE" + InlineFunctionExpansion="1" + Optimization="2" + RuntimeLibrary="0" + RuntimeTypeInfo="TRUE" + WarningLevel="3" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"RelWithDebInfo\""" + AssemblerListingLocation="RelWithDebInfo" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/taocrypt/RelWithDebInfo/taocrypt.pdb" +/> + <Tool + Name="VCCustomBuildTool"/> + <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"RelWithDebInfo\"""/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,"CMAKE_INTDIR=\"RelWithDebInfo\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPreLinkEventTool"/> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool"/> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCLibrarianTool" + OutputFile="$(OutDir)\taocrypt.lib"/> </Configuration> </Configurations> - <References> - </References> <Files> + <File + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt"> + <FileConfiguration + Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/taocrypt/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;" + Outputs="taocrypt.vcproj.cmake"/> + </FileConfiguration> + <FileConfiguration + Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/taocrypt/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;" + Outputs="taocrypt.vcproj.cmake"/> + </FileConfiguration> + <FileConfiguration + Name="MinSizeRel|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/taocrypt/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;" + Outputs="taocrypt.vcproj.cmake"/> + </FileConfiguration> + <FileConfiguration + Name="RelWithDebInfo|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/taocrypt/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\taocrypt\CMakeLists.txt;" + Outputs="taocrypt.vcproj.cmake"/> + </FileConfiguration> + </File> <Filter Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + Filter=""> <File - RelativePath="src\aes.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\aes.cpp"> </File> <File - RelativePath="src\aestables.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\aestables.cpp"> </File> <File - RelativePath="src\algebra.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\algebra.cpp"> </File> <File - RelativePath="src\arc4.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\arc4.cpp"> </File> <File - RelativePath="src\asn.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\asn.cpp"> </File> <File - RelativePath="src\coding.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\coding.cpp"> </File> <File - RelativePath="src\des.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\des.cpp"> </File> <File - RelativePath="src\dh.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\dh.cpp"> </File> <File - RelativePath="src\dsa.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\dsa.cpp"> </File> <File - RelativePath="src\file.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\file.cpp"> </File> <File - RelativePath="src\hash.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\hash.cpp"> </File> <File - RelativePath="src\integer.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\integer.cpp"> </File> <File - RelativePath="src\md2.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\md2.cpp"> </File> <File - RelativePath="src\md4.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\md4.cpp"> </File> <File - RelativePath="src\md5.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\md5.cpp"> </File> <File - RelativePath="src\misc.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\misc.cpp"> </File> <File - RelativePath="src\random.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\random.cpp"> </File> <File - RelativePath="src\ripemd.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\ripemd.cpp"> </File> <File - RelativePath="src\rsa.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\rsa.cpp"> </File> <File - RelativePath="src\sha.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\src\sha.cpp"> </File> </Filter> <Filter Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> + Filter=""> <File - RelativePath="include\aes.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\aes.hpp"> </File> <File - RelativePath="include\algebra.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\algebra.hpp"> </File> <File - RelativePath="include\arc4.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\arc4.hpp"> </File> <File - RelativePath="include\asn.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\asn.hpp"> </File> <File - RelativePath="include\block.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\block.hpp"> </File> <File - RelativePath="include\coding.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\coding.hpp"> </File> <File - RelativePath="include\des.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\des.hpp"> </File> <File - RelativePath="include\dh.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\dh.hpp"> </File> <File - RelativePath="include\dsa.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\dsa.hpp"> </File> <File - RelativePath="include\error.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\dsa.hpp"> </File> <File - RelativePath="include\file.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\error.hpp"> </File> <File - RelativePath="include\hash.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\file.hpp"> </File> <File - RelativePath="include\hmac.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\hash.hpp"> </File> <File - RelativePath="include\integer.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\hmac.hpp"> </File> <File - RelativePath="include\md2.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\integer.hpp"> </File> <File - RelativePath="include\md4.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\md2.hpp"> </File> <File - RelativePath="include\md5.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\md5.hpp"> </File> <File - RelativePath="include\misc.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\misc.hpp"> </File> <File - RelativePath="include\modarith.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\modarith.hpp"> </File> <File - RelativePath="include\modes.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\modes.hpp"> </File> <File - RelativePath="include\random.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\random.hpp"> </File> <File - RelativePath="include\ripemd.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\ripemd.hpp"> </File> <File - RelativePath="include\rsa.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\rsa.hpp"> </File> <File - RelativePath="include\sha.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include\sha.hpp"> </File> </Filter> </Files> diff -Nrup a/extra/yassl/yassl.vcproj b/extra/yassl/yassl.vcproj --- a/extra/yassl/yassl.vcproj 2007-03-19 11:17:48 -04:00 +++ b/extra/yassl/yassl.vcproj 2008-04-09 12:43:34 -04:00 @@ -1,208 +1,323 @@ -<?xml version="1.0" encoding="Windows-1252"?> +<?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="yassl" + ProjectGUID="{7613E480-1732-434B-B7E2-2932E21D7BDF}" SccProjectName="" - SccLocalPath=""> + SccLocalPath="" + Keyword="Win32Proj"> <Platforms> <Platform - Name="Win32"/> + Name="x64"/> </Platforms> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory=".\debug_obj" - IntermediateDirectory=".\debug_obj" + Name="Debug|x64" + OutputDirectory="Debug" + IntermediateDirectory="yassl.dir\Debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" - Optimization="0" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;YASSL_PREFIX" - ExceptionHandling="FALSE" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" BasicRuntimeChecks="3" + CompileAs="2" + DebugInformationFormat="3" + ExceptionHandling="FALSE" + InlineFunctionExpansion="0" + Optimization="0" RuntimeLibrary="1" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\debug_obj/yassl.pch" - AssemblerListingLocation=".\debug_obj/" - ObjectFile=".\debug_obj/" - ProgramDataBaseFileName=".\debug_obj/" - BrowseInformation="1" + RuntimeTypeInfo="TRUE" WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4" - CompileAs="0"/> + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"Debug\""" + AssemblerListingLocation="Debug" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/Debug/yassl.pdb" +/> <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLibrarianTool" - OutputFile=".\debug_obj\yassl.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"Debug\"""/> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"Debug\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\yassl.lib"/> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="Release" + IntermediateDirectory="yassl.dir\Release" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" + CompileAs="2" + ExceptionHandling="FALSE" + InlineFunctionExpansion="2" + Optimization="2" + RuntimeLibrary="0" + RuntimeTypeInfo="TRUE" + WarningLevel="3" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"Release\""" + AssemblerListingLocation="Release" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/Release/yassl.pdb" +/> + <Tool + Name="VCCustomBuildTool"/> + <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"Release\"""/> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"Release\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPreBuildEventTool"/> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCPreLinkEventTool"/> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\yassl.lib"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\release_obj" - IntermediateDirectory=".\release_obj" + Name="MinSizeRel|x64" + OutputDirectory="MinSizeRel" + IntermediateDirectory="yassl.dir\MinSizeRel" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;YASSL_PREFIX" - StringPooling="TRUE" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" + CompileAs="2" ExceptionHandling="FALSE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\release_obj/yassl.pch" - AssemblerListingLocation=".\release_obj/" - ObjectFile=".\release_obj/" - ProgramDataBaseFileName=".\release_obj/" + InlineFunctionExpansion="1" + Optimization="1" + RuntimeLibrary="2" + RuntimeTypeInfo="TRUE" WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"MinSizeRel\""" + AssemblerListingLocation="MinSizeRel" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/MinSizeRel/yassl.pdb" +/> <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLibrarianTool" - OutputFile=".\release_obj\yassl.lib" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCMIDLTool"/> + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"MinSizeRel\"""/> <Tool - Name="VCPostBuildEventTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"MinSizeRel\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\yassl.lib"/> + </Configuration> + <Configuration + Name="RelWithDebInfo|x64" + OutputDirectory="RelWithDebInfo" + IntermediateDirectory="yassl.dir\RelWithDebInfo" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" + CompileAs="2" + DebugInformationFormat="3" + ExceptionHandling="FALSE" + InlineFunctionExpansion="1" + Optimization="2" + RuntimeLibrary="0" + RuntimeTypeInfo="TRUE" + WarningLevel="3" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"RelWithDebInfo\""" + AssemblerListingLocation="RelWithDebInfo" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/extra/yassl/RelWithDebInfo/yassl.pdb" +/> + <Tool + Name="VCCustomBuildTool"/> + <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\extra\yassl\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\include;R:\bug29125\my50-bug29125\extra\yassl\taocrypt\mySTL;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"RelWithDebInfo\"""/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,_LIB,YASSL_PREFIX,"CMAKE_INTDIR=\"RelWithDebInfo\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCPreBuildEventTool"/> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCPreLinkEventTool"/> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool"/> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCLibrarianTool" + OutputFile="$(OutDir)\yassl.lib"/> </Configuration> </Configurations> - <References> - </References> <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File - RelativePath="src\buffer.cpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt"> + <FileConfiguration + Name="Debug|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;" + Outputs="yassl.vcproj.cmake"/> + </FileConfiguration> + <FileConfiguration + Name="Release|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;" + Outputs="yassl.vcproj.cmake"/> + </FileConfiguration> + <FileConfiguration + Name="MinSizeRel|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;" + Outputs="yassl.vcproj.cmake"/> + </FileConfiguration> + <FileConfiguration + Name="RelWithDebInfo|x64"> + <Tool + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/extra/yassl/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\extra\yassl\CMakeLists.txt;" + Outputs="yassl.vcproj.cmake"/> + </FileConfiguration> </File> - <File - RelativePath="src\cert_wrapper.cpp"> - </File> - <File - RelativePath="src\crypto_wrapper.cpp"> - </File> - <File - RelativePath="src\handshake.cpp"> - </File> - <File - RelativePath="src\lock.cpp"> - </File> - <File - RelativePath="src\log.cpp"> - </File> - <File - RelativePath="src\socket_wrapper.cpp"> - </File> - <File - RelativePath="src\ssl.cpp"> - </File> - <File - RelativePath="src\timer.cpp"> - </File> - <File - RelativePath="src\yassl_error.cpp"> - </File> - <File - RelativePath="src\yassl_imp.cpp"> - </File> - <File - RelativePath="src\yassl_int.cpp"> - </File> - </Filter> <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - <File - RelativePath="include\buffer.hpp"> - </File> + Name="Source Files" + Filter=""> <File - RelativePath="include\cert_wrapper.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\buffer.cpp"> </File> <File - RelativePath="include\crypto_wrapper.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\cert_wrapper.cpp"> </File> <File - RelativePath="include\factory.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\crypto_wrapper.cpp"> </File> <File - RelativePath="include\handshake.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\handshake.cpp"> </File> <File - RelativePath="include\lock.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\lock.cpp"> </File> <File - RelativePath="include\log.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\log.cpp"> </File> <File - RelativePath="include\socket_wrapper.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\socket_wrapper.cpp"> </File> <File - RelativePath="include\timer.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\ssl.cpp"> </File> <File - RelativePath="include\yassl_error.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\timer.cpp"> </File> <File - RelativePath="include\yassl_imp.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\yassl_error.cpp"> </File> <File - RelativePath="include\yassl_int.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\yassl_imp.cpp"> </File> <File - RelativePath="include\yassl_types.hpp"> + RelativePath="R:\bug29125\my50-bug29125\extra\yassl\src\yassl_int.cpp"> </File> </Filter> </Files> diff -Nrup a/heap/hp_write.c b/heap/hp_write.c --- a/heap/hp_write.c 2007-04-13 02:14:37 -04:00 +++ b/heap/hp_write.c 2008-04-09 12:43:34 -04:00 @@ -69,7 +69,7 @@ int heap_write(HP_INFO *info, const byte err: if (my_errno == HA_ERR_FOUND_DUPP_KEY) DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef))); - info->errkey= keydef - share->keydef; + info->errkey= (int) (keydef - share->keydef); /* We don't need to delete non-inserted key from rb-tree. Also, if we got ENOMEM, the key wasn't inserted, so don't try to delete it diff -Nrup a/include/my_sys.h b/include/my_sys.h --- a/include/my_sys.h 2008-01-31 10:15:35 -05:00 +++ b/include/my_sys.h 2008-04-09 12:43:34 -04:00 @@ -250,7 +250,7 @@ extern int NEAR my_umask, /* Default cr NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */ NEAR my_dont_interrupt; /* call remember_intr when set */ extern my_bool NEAR mysys_uses_curses, my_use_symdir; -extern ulong sf_malloc_cur_memory, sf_malloc_max_memory; +extern size_t sf_malloc_cur_memory, sf_malloc_max_memory; extern ulong my_default_record_cache_size; extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, diff -Nrup a/innobase/include/pars0pars.h b/innobase/include/pars0pars.h --- a/innobase/include/pars0pars.h 2005-03-07 05:03:26 -05:00 +++ b/innobase/include/pars0pars.h 2008-04-09 12:43:34 -04:00 @@ -484,7 +484,7 @@ struct for_node_struct{ definition */ que_node_t* loop_start_limit;/* initial value of loop variable */ que_node_t* loop_end_limit; /* end value of loop variable */ - int loop_end_value; /* evaluated value for the end value: + lint loop_end_value; /* evaluated value for the end value: it is calculated only when the loop is entered, and will not change within the loop */ diff -Nrup a/innobase/pars/pars0pars.c b/innobase/pars/pars0pars.c --- a/innobase/pars/pars0pars.c 2004-12-02 12:42:32 -05:00 +++ b/innobase/pars/pars0pars.c 2008-04-09 12:43:34 -04:00 @@ -1679,8 +1679,8 @@ pars_get_lex_chars( { int len; - len = pars_sym_tab_global->string_len - - pars_sym_tab_global->next_char_pos; + len= (uint) (pars_sym_tab_global->string_len + - pars_sym_tab_global->next_char_pos); if (len == 0) { #ifdef YYDEBUG /* fputs("SQL string ends\n", stderr); */ diff -Nrup a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c --- a/innobase/rem/rem0cmp.c 2005-12-13 08:12:46 -05:00 +++ b/innobase/rem/rem0cmp.c 2008-04-09 12:43:34 -04:00 @@ -587,7 +587,7 @@ cmp_dtuple_rec_with_match( dtuple_byte = cmp_collate(dtuple_byte); } - ret = dtuple_byte - rec_byte; + ret = (uint) (dtuple_byte - rec_byte); if (UNIV_UNLIKELY(ret)) { if (ret < 0) { ret = -1; diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c --- a/libmysql/libmysql.c 2008-03-29 03:52:01 -04:00 +++ b/libmysql/libmysql.c 2008-04-09 12:43:34 -04:00 @@ -3552,7 +3552,7 @@ static void fetch_string_with_conversion */ char *start= value + param->offset; char *end= value + length; - ulong copy_length; + size_t copy_length; if (start < end) { copy_length= end - start; @@ -3807,11 +3807,11 @@ static void fetch_float_with_conversion( if (field->flags & ZEROFILL_FLAG && length < field->length && field->length < MAX_DOUBLE_STRING_REP_LENGTH - 1) { - bmove_upp((char*) buff + field->length, buff + length, length); + bmove_upp((char*) buff + field->length, buff + length, (uint) length); bfill((char*) buff, field->length - length, '0'); length= field->length; } - fetch_string_with_conversion(param, buff, length); + fetch_string_with_conversion(param, buff, (uint) length); } break; diff -Nrup a/libmysql/manager.c b/libmysql/manager.c --- a/libmysql/manager.c 2004-10-18 03:43:47 -04:00 +++ b/libmysql/manager.c 2008-04-09 12:43:34 -04:00 @@ -159,7 +159,7 @@ MYSQL_MANAGER* STDCALL mysql_manager_co goto err; } sprintf(msg_buf,"%-.16s %-.16s\n",user,passwd); - msg_len=strlen(msg_buf); + msg_len= (uint) strlen(msg_buf); if (my_net_write(&con->net,msg_buf,msg_len) || net_flush(&con->net)) { con->last_errno=con->net.last_errno; @@ -219,7 +219,7 @@ int STDCALL mysql_manager_command(MYSQL_ int cmd_len) { if (!cmd_len) - cmd_len=strlen(cmd); + cmd_len= (uint) strlen(cmd); if (my_net_write(&con->net,(char*)cmd,cmd_len) || net_flush(&con->net)) { con->last_errno=errno; diff -Nrup a/myisam/mi_check.c b/myisam/mi_check.c --- a/myisam/mi_check.c 2008-03-29 11:50:43 -04:00 +++ b/myisam/mi_check.c 2008-04-09 12:43:34 -04:00 @@ -659,7 +659,7 @@ void mi_collect_stats_nonulls_first(HA_K uchar *key) { uint first_null, kp; - first_null= ha_find_null(keyseg, key) - keyseg; + first_null= (uint) (ha_find_null(keyseg, key) - keyseg); /* All prefix tuples that don't include keypart_{first_null} are not-null tuples (and all others aren't), increment counters for them. @@ -715,7 +715,7 @@ int mi_collect_stats_nonulls_next(HA_KEY seg= keyseg + diffs[0] - 1; /* Find first NULL in last_key */ - first_null_seg= ha_find_null(seg, last_key + diffs[1]) - keyseg; + first_null_seg= (uint) (ha_find_null(seg, last_key + diffs[1]) - keyseg); for (kp= 0; kp < first_null_seg; kp++) notnull[kp]++; @@ -3913,7 +3913,7 @@ static int sort_ft_key_write(MI_SORT_PAR key_block++; sort_info->key_block=key_block; sort_param->keyinfo=& sort_info->info->s->ft2_keyinfo; - ft_buf->count=(ft_buf->buf - p)/val_len; + ft_buf->count=(uint) (ft_buf->buf - p)/val_len; /* flushing buffer to second-level tree */ for (error=0; !error && p < ft_buf->buf; p+= val_len) diff -Nrup a/myisam/mi_open.c b/myisam/mi_open.c --- a/myisam/mi_open.c 2008-03-29 03:52:02 -04:00 +++ b/myisam/mi_open.c 2008-04-09 12:43:34 -04:00 @@ -103,7 +103,8 @@ MI_INFO *mi_open(const char *name, int m share_buff.state.rec_per_key_part=rec_per_key_part; share_buff.state.key_root=key_root; share_buff.state.key_del=key_del; - share_buff.key_cache= multi_key_cache_search(name_buff, strlen(name_buff)); + share_buff.key_cache= multi_key_cache_search(name_buff, + (uint) strlen(name_buff)); DBUG_EXECUTE_IF("myisam_pretend_crashed_table_on_open", if (strstr(name, "/t1")) @@ -305,7 +306,7 @@ MI_INFO *mi_open(const char *name, int m (char*) key_del, (sizeof(my_off_t) * share->state.header.max_block_size)); strmov(share->unique_file_name, name_buff); - share->unique_name_length= strlen(name_buff); + share->unique_name_length= (uint) strlen(name_buff); strmov(share->index_file_name, index_name); strmov(share->data_file_name, data_name); diff -Nrup a/myisam/mi_packrec.c b/myisam/mi_packrec.c --- a/myisam/mi_packrec.c 2008-03-29 03:52:02 -04:00 +++ b/myisam/mi_packrec.c 2008-04-09 12:43:34 -04:00 @@ -254,7 +254,7 @@ my_bool _mi_read_pack_info(MI_INFO *info MYF(MY_HOLD_ON_ERROR)); /* Fix the table addresses in the tree heads. */ { - long diff=PTR_BYTE_DIFF(decode_table,share->decode_tables); + my_ptrdiff_t diff=PTR_BYTE_DIFF(decode_table,share->decode_tables); share->decode_tables=decode_table; for (i=0 ; i < trees ; i++) share->decode_trees[i].table=ADD_TO_PTR(share->decode_trees[i].table, diff -Nrup a/myisam/mi_search.c b/myisam/mi_search.c --- a/myisam/mi_search.c 2008-03-29 03:52:02 -04:00 +++ b/myisam/mi_search.c 2008-04-09 12:43:34 -04:00 @@ -408,7 +408,7 @@ int _mi_prefix_search(MI_INFO *info, reg } from+=keyseg->length; page=from+nod_flag; - length=from-vseg; + length= (uint) (from - vseg); } if (page > end) diff -Nrup a/myisam/rt_index.c b/myisam/rt_index.c --- a/myisam/rt_index.c 2007-10-05 06:41:05 -04:00 +++ b/myisam/rt_index.c 2008-04-09 12:43:34 -04:00 @@ -95,7 +95,7 @@ static int rtree_find_req(MI_INFO *info, _mi_kpos(nod_flag, k), level + 1))) { case 0: /* found - exit from recursion */ - *saved_key = k - page_buf; + *saved_key = (uint) (k - page_buf); goto ok; case 1: /* not found - continue searching */ info->rtree_recursion_depth = level; @@ -117,7 +117,7 @@ static int rtree_find_req(MI_INFO *info, info->lastkey_length = k_len + info->s->base.rec_reflength; memcpy(info->lastkey, k, info->lastkey_length); info->rtree_recursion_depth = level; - *saved_key = last - page_buf; + *saved_key = (uint) (last - page_buf); if (after_key < last) { @@ -314,7 +314,7 @@ static int rtree_get_req(MI_INFO *info, _mi_kpos(nod_flag, k), level + 1))) { case 0: /* found - exit from recursion */ - *saved_key = k - page_buf; + *saved_key = (uint) (k - page_buf); goto ok; case 1: /* not found - continue searching */ info->rtree_recursion_depth = level; @@ -333,7 +333,7 @@ static int rtree_get_req(MI_INFO *info, memcpy(info->lastkey, k, info->lastkey_length); info->rtree_recursion_depth = level; - *saved_key = k - page_buf; + *saved_key = (uint) (k - page_buf); if (after_key < last) { @@ -420,7 +420,7 @@ int rtree_get_next(MI_INFO *info, uint k info->lastkey_length = k_len + info->s->base.rec_reflength; memcpy(info->lastkey, key, k_len + info->s->base.rec_reflength); - *(int*)info->int_keypos = key - info->buff; + *(uint*)info->int_keypos = (uint) (key - info->buff); if (after_key >= info->int_maxpos) { info->buff_used = 1; diff -Nrup a/mysys/base64.c b/mysys/base64.c --- a/mysys/base64.c 2007-02-22 09:59:54 -05:00 +++ b/mysys/base64.c 2008-04-09 12:43:34 -04:00 @@ -193,7 +193,7 @@ base64_decode(const char *src, size_t si { return -1; } - return d - dst_base; + return (int) (d - dst_base); } diff -Nrup a/mysys/default.c b/mysys/default.c --- a/mysys/default.c 2007-11-16 16:56:35 -05:00 +++ b/mysys/default.c 2008-04-09 12:43:34 -04:00 @@ -168,7 +168,7 @@ int my_search_option_files(const char *c /* Handle --defaults-group-suffix= */ uint i; const char **extra_groups; - const uint instance_len= strlen(my_defaults_group_suffix); + const size_t instance_len= strlen(my_defaults_group_suffix); struct handle_option_ctx *ctx= (struct handle_option_ctx*) func_ctx; char *ptr; TYPELIB *group= ctx->group; @@ -180,11 +180,11 @@ int my_search_option_files(const char *c for (i= 0; i < group->count; i++) { - uint len; + size_t len; extra_groups[i]= group->type_names[i]; /** copy group */ len= strlen(extra_groups[i]); - if (!(ptr= alloc_root(ctx->alloc, len+instance_len+1))) + if (!(ptr= alloc_root(ctx->alloc, (uint) (len+instance_len+1)))) goto err; extra_groups[i+group->count]= ptr; diff -Nrup a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c --- a/mysys/mf_iocache2.c 2007-01-22 07:10:36 -05:00 +++ b/mysys/mf_iocache2.c 2008-04-09 12:43:34 -04:00 @@ -368,9 +368,9 @@ uint my_b_vprintf(IO_CACHE *info, const else { /* %% or unknown code */ - if (my_b_write(info, backtrack, fmt-backtrack)) + if (my_b_write(info, backtrack, (uint) (fmt - backtrack))) goto err; - out_length+= fmt-backtrack; + out_length+= (uint) (fmt - backtrack); } } return out_length; diff -Nrup a/mysys/my_static.c b/mysys/my_static.c --- a/mysys/my_static.c 2007-04-12 05:46:05 -04:00 +++ b/mysys/my_static.c 2008-04-09 12:43:34 -04:00 @@ -74,8 +74,8 @@ uint sf_malloc_prehunc=0, /* If you hav sf_malloc_endhunc=0, /* dump when malloc-message.... */ /* set theese to 64 or 128 */ sf_malloc_quick=0; /* set if no calls to sanity */ -ulong sf_malloc_cur_memory= 0L; /* Current memory usage */ -ulong sf_malloc_max_memory= 0L; /* Maximum memory usage */ +size_t sf_malloc_cur_memory= 0L; /* Current memory usage */ +size_t sf_malloc_max_memory= 0L; /* Maximum memory usage */ uint sf_malloc_count= 0; /* Number of times NEW() was called */ byte *sf_min_adress= (byte*) ~(unsigned long) 0L, *sf_max_adress= (byte*) 0L; diff -Nrup a/mysys/safemalloc.c b/mysys/safemalloc.c --- a/mysys/safemalloc.c 2007-08-29 11:20:12 -04:00 +++ b/mysys/safemalloc.c 2008-04-09 12:43:34 -04:00 @@ -173,7 +173,7 @@ gptr _mymalloc(size_t size, const char * data[size + 3]= MAGICEND3; irem->filename= (my_string) filename; irem->linenum= lineno; - irem->datasize= size; + irem->datasize= (uint32) size; irem->prev= NULL; /* Add this remember structure to the linked list */ diff -Nrup a/mysys/string.c b/mysys/string.c --- a/mysys/string.c 2007-01-19 13:20:49 -05:00 +++ b/mysys/string.c 2008-04-09 12:43:35 -04:00 @@ -150,12 +150,12 @@ my_bool dynstr_append_os_quoted(DYNAMIC_ /* Search for quote in each string and replace with escaped quote */ while(*(next_pos= strcend(cur_pos, quote_str[0])) != '\0') { - ret&= dynstr_append_mem(str, cur_pos, next_pos - cur_pos); + ret&= dynstr_append_mem(str, cur_pos, (uint) (next_pos - cur_pos)); ret&= dynstr_append_mem(str ,"\\", 1); ret&= dynstr_append_mem(str, quote_str, quote_len); cur_pos= next_pos + 1; } - ret&= dynstr_append_mem(str, cur_pos, next_pos - cur_pos); + ret&= dynstr_append_mem(str, cur_pos, (uint) (next_pos - cur_pos)); append= va_arg(dirty_text, char *); } va_end(dirty_text); diff -Nrup a/server-tools/instance-manager/buffer.cc b/server-tools/instance-manager/buffer.cc --- a/server-tools/instance-manager/buffer.cc 2006-12-23 14:04:23 -05:00 +++ b/server-tools/instance-manager/buffer.cc 2008-04-09 12:43:35 -04:00 @@ -100,7 +100,7 @@ err: int Buffer::get_size() { - return buffer_size; + return (uint) buffer_size; } diff -Nrup a/server-tools/instance-manager/commands.cc b/server-tools/instance-manager/commands.cc --- a/server-tools/instance-manager/commands.cc 2006-12-23 14:04:23 -05:00 +++ b/server-tools/instance-manager/commands.cc 2008-04-09 12:43:35 -04:00 @@ -52,11 +52,11 @@ static inline int put_to_buff(Buffer *buff, const char *str, uint *position) { - uint len= strlen(str); - if (buff->append(*position, str, len)) + size_t len= strlen(str); + if (buff->append(*position, str, (uint) len)) return 1; - *position+= len; + *position+= (uint) len; return 0; } @@ -201,7 +201,7 @@ int Show_instance_status::execute(struct Instance *instance; store_to_protocol_packet(&send_buff, (char*) instance_name, &position); - if (!(instance= instance_map->find(instance_name, strlen(instance_name)))) + if (!(instance= instance_map->find(instance_name, (uint) strlen(instance_name)))) goto err; if (instance->is_running()) store_to_protocol_packet(&send_buff, (char*) "online", &position); @@ -272,7 +272,7 @@ int Show_instance_options::execute(struc { Instance *instance; - if (!(instance= instance_map->find(instance_name, strlen(instance_name)))) + if (!(instance= instance_map->find(instance_name, (uint) strlen(instance_name)))) goto err; store_to_protocol_packet(&send_buff, (char*) "instance_name", &position); store_to_protocol_packet(&send_buff, (char*) instance_name, &position); @@ -452,7 +452,7 @@ int Show_instance_log::execute(struct st File fd; if ((instance= instance_map->find(instance_name, - strlen(instance_name))) == NULL) + (uint) strlen(instance_name))) == NULL) goto err; logpath= instance->options.logs[log_type]; @@ -479,13 +479,13 @@ int Show_instance_log::execute(struct st buff_size= (size - offset); - read_buff.reserve(0, buff_size); + read_buff.reserve(0, (uint) buff_size); /* read in one chunk */ read_len= (int)my_seek(fd, file_stat.st_size - size, MY_SEEK_SET, MYF(0)); if ((read_len= my_read(fd, (byte*) read_buff.buffer, - buff_size, MYF(0))) < 0) + (uint) buff_size, MYF(0))) < 0) return ER_READ_FILE; store_to_protocol_packet(&send_buff, read_buff.buffer, &position, read_len); @@ -569,7 +569,7 @@ int Show_instance_log_files::execute(str Instance *instance; if ((instance= instance_map-> - find(instance_name, strlen(instance_name))) == NULL) + find(instance_name, (uint) strlen(instance_name))) == NULL) goto err; { diff -Nrup a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc --- a/server-tools/instance-manager/instance.cc 2006-12-27 00:28:19 -05:00 +++ b/server-tools/instance-manager/instance.cc 2008-04-09 12:43:35 -04:00 @@ -173,7 +173,7 @@ static int start_process(Instance_option int cmdlen= 0; for (int i= 0; instance_options->argv[i] != 0; i++) - cmdlen+= strlen(instance_options->argv[i]) + 3; + cmdlen+= (uint) strlen(instance_options->argv[i]) + 3; cmdlen++; /* make room for the null */ char *cmdline= new char[cmdlen]; diff -Nrup a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc --- a/server-tools/instance-manager/instance_map.cc 2006-12-23 14:04:23 -05:00 +++ b/server-tools/instance-manager/instance_map.cc 2008-04-09 12:43:35 -04:00 @@ -112,7 +112,7 @@ int Instance_map::process_one_option(con || group[sizeof(prefix)] == '\0')) { if (!(instance= (Instance *) hash_search(&hash, (byte *) group, - strlen(group)))) + (uint) strlen(group)))) { if (!(instance= new Instance)) goto err; diff -Nrup a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc --- a/server-tools/instance-manager/instance_options.cc 2007-03-01 16:06:33 -05:00 +++ b/server-tools/instance-manager/instance_options.cc 2008-04-09 12:43:35 -04:00 @@ -257,7 +257,7 @@ int Instance_options::fill_log_options() strmov(hostname, "mysql"); hostname[MAX_LOG_OPTION_LENGTH - 1]= 0; /* Safety */ - hostname_length= strlen(hostname); + hostname_length= (uint) strlen(hostname); for (log_files= logs_st; log_files->name; log_files++) @@ -392,7 +392,7 @@ int Instance_options::complete_initializ if (!mysqld_path) { // Need one extra byte, as convert_dirname() adds a slash at the end. - if (!(mysqld_path= alloc_root(&alloc, strlen(default_path) + 2))) + if (!(mysqld_path= alloc_root(&alloc, (uint) strlen(default_path) + 2))) goto err; strcpy((char *)mysqld_path, default_path); } @@ -401,7 +401,7 @@ int Instance_options::complete_initializ end= convert_dirname((char*)mysqld_path, mysqld_path, NullS); end[-1]= 0; - mysqld_path_len= strlen(mysqld_path); + mysqld_path_len= (uint) strlen(mysqld_path); if (mysqld_port) mysqld_port_val= atoi(strchr(mysqld_port, '=') + 1); @@ -572,7 +572,7 @@ void Instance_options::print_argv() int Instance_options::init(const char *instance_name_arg) { - instance_name_len= strlen(instance_name_arg); + instance_name_len= (uint) strlen(instance_name_arg); init_alloc_root(&alloc, MEM_ROOT_BLOCK_SIZE, 0); diff -Nrup a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc --- a/server-tools/instance-manager/listener.cc 2007-06-20 07:59:59 -04:00 +++ b/server-tools/instance-manager/listener.cc 2008-04-09 12:43:35 -04:00 @@ -35,23 +35,28 @@ #include "portability.h" +#ifndef __WIN__ static void set_non_blocking(int socket) { -#ifndef __WIN__ int flags= fcntl(socket, F_GETFL, 0); fcntl(socket, F_SETFL, flags | O_NONBLOCK); #else +static void set_non_blocking(SOCKET socket) +{ u_long arg= 1; ioctlsocket(socket, FIONBIO, &arg); #endif } +#ifndef __WIN__ static void set_no_inherit(int socket) { -#ifndef __WIN__ int flags= fcntl(socket, F_GETFD, 0); fcntl(socket, F_SETFD, flags | FD_CLOEXEC); +#else +static void set_no_inherit(SOCKET socket) +{ #endif } @@ -71,7 +76,11 @@ private: ulong total_connection_count; Thread_info thread_info; +#ifdef __WIN__ + SOCKET sockets[2]; +#else int sockets[2]; +#endif int num_sockets; fd_set read_fds; private: @@ -110,9 +119,10 @@ Listener_thread::~Listener_thread() void Listener_thread::run() { - int i, n= 0; + int i= 0; #ifndef __WIN__ + int n= 0; /* we use this var to check whether we are running on LinuxThreads */ pid_t thread_pid; @@ -121,6 +131,8 @@ void Listener_thread::run() struct sockaddr_un unix_socket_address; /* set global variable */ linuxthreads= (thread_pid != manager_pid); +#else + SOCKET n= 0; #endif thread_registry.register_thread(&thread_info); @@ -159,7 +171,11 @@ void Listener_thread::run() signal during shutdown. This results in failing assert (Thread_registry::~Thread_registry). Valgrind 2.2 works fine. */ +#ifdef __WIN__ + int rc= select(0, &read_fds_arg, 0, 0, &tv); +#else int rc= select(n, &read_fds_arg, 0, 0, &tv); +#endif if (rc == 0 || rc == -1) { @@ -175,11 +191,18 @@ void Listener_thread::run() /* Assuming that rc > 0 as we asked to wait forever */ if (FD_ISSET(sockets[socket_index], &read_fds_arg)) { +#ifdef __WIN__ + SOCKET client_fd= accept(sockets[socket_index], 0, 0); + /* accept may return INVALID_SOCKET on failure */ + if (client_fd != INVALID_SOCKET) + { +#else int client_fd= accept(sockets[socket_index], 0, 0); /* accept may return -1 (failure or spurious wakeup) */ if (client_fd >= 0) // connection established { set_no_inherit(client_fd); +#endif Vio *vio= vio_new(client_fd, socket_index == 0 ? VIO_TYPE_SOCKET : VIO_TYPE_TCPIP, @@ -230,7 +253,11 @@ int Listener_thread::create_tcp_socket() /* value to be set by setsockopt */ int arg= 1; +#ifdef __WIN__ + SOCKET ip_socket= socket(AF_INET, SOCK_STREAM, 0); +#else int ip_socket= socket(AF_INET, SOCK_STREAM, 0); +#endif if (ip_socket == INVALID_SOCKET) { log_error("Listener_thead::run(): socket(AF_INET) failed, %s", diff -Nrup a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc --- a/server-tools/instance-manager/mysql_connection.cc 2007-05-24 05:21:23 -04:00 +++ b/server-tools/instance-manager/mysql_connection.cc 2008-04-09 12:43:35 -04:00 @@ -241,7 +241,7 @@ int Mysql_connection_thread::check_conne /* write connection message and read reply */ enum { MIN_HANDSHAKE_SIZE= 2 }; - if (net_write_command(&net, protocol_version, "", 0, buff, pos - buff) || + if (net_write_command(&net, protocol_version, "", 0, buff, (uint) (pos - buff)) || (pkt_len= my_net_read(&net)) == packet_error || pkt_len < MIN_HANDSHAKE_SIZE) { @@ -275,7 +275,7 @@ int Mysql_connection_thread::check_conne net_send_error(&net, ER_ACCESS_DENIED_ERROR); return 1; } - if (user_map.authenticate(user, password-user-2, password, scramble)) + if (user_map.authenticate(user, (uint) (password - user - 2), password, scramble)) { net_send_error(&net, ER_ACCESS_DENIED_ERROR); return 1; diff -Nrup a/server-tools/instance-manager/mysqlmanager.vcproj b/server-tools/instance-manager/mysqlmanager.vcproj --- a/server-tools/instance-manager/mysqlmanager.vcproj 2007-03-19 11:17:48 -04:00 +++ b/server-tools/instance-manager/mysqlmanager.vcproj 2008-04-09 12:43:35 -04:00 @@ -1,379 +1,580 @@ -<?xml version="1.0" encoding="Windows-1252"?> +<?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8.00" Name="mysqlmanager" - ProjectGUID="{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}" + ProjectGUID="{3835A469-849D-4A06-BFA5-9980F2CA9D24}" + SccProjectName="" + SccLocalPath="" Keyword="Win32Proj"> <Platforms> <Platform - Name="Win32"/> + Name="x64"/> </Platforms> <Configurations> <Configuration - Name="Debug|Win32" - OutputDirectory=".\debug_obj" - IntermediateDirectory=".\debug_obj" + Name="Debug|x64" + OutputDirectory="Debug" + IntermediateDirectory="mysqlmanager.dir\Debug" ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" - Optimization="0" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include" - PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;CONSOLE" - MinimalRebuild="TRUE" - ExceptionHandling="FALSE" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" BasicRuntimeChecks="3" + CompileAs="2" + DebugInformationFormat="3" + ExceptionHandling="FALSE" + InlineFunctionExpansion="0" + Optimization="0" RuntimeLibrary="1" - UsePrecompiledHeader="0" + RuntimeTypeInfo="TRUE" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,SAFEMALLOC,SAFE_MUTEX,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"Debug\""" + AssemblerListingLocation="Debug" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/server-tools/instance-manager/Debug/mysqlmanager.pdb" +/> <Tool Name="VCCustomBuildTool"/> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wsock32.lib" - OutputFile=".\debug/mysqlmanager.exe" - LinkIncremental="1" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\debug/mysqlmanager.pdb" - GenerateMapFile="TRUE" - MapFileName=".\debug/mysqlmanager.map" - SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,SAFEMALLOC,SAFE_MUTEX,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"Debug\"""/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,FORCE_INIT_OF_VARS,SAFEMALLOC,SAFE_MUTEX,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"Debug\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool - Name="VCResourceCompilerTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool"/> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCLinkerTool" + AdditionalOptions=" /STACK:10000000 /machine:x64 /MAP /MAPINFO:EXPORTS /STACK:1048576 /debug" + AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib dbug.lib mysys.lib strings.lib taocrypt.lib vio.lib yassl.lib zlib.lib wsock32.lib " + OutputFile="Debug\mysqlmanager.exe" + Version="0.0" + GenerateManifest="FALSE" + LinkIncremental="2" + AdditionalLibraryDirectories="..\..\dbug\$(OutDir),..\..\dbug,..\..\mysys\$(OutDir),..\..\mysys,..\..\strings\$(OutDir),..\..\strings,..\..\extra\yassl\taocrypt\$(OutDir),..\..\extra\yassl\taocrypt,..\..\vio\$(OutDir),..\..\vio,..\..\extra\yassl\$(OutDir),..\..\extra\yassl,..\..\zlib\$(OutDir),..\..\zlib" + ProgramDataBaseFile="$(OutDir)\mysqlmanager.pdb" + GenerateDebugInformation="TRUE" + SubSystem="1" + StackReserveSize="10000000"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\release_obj" - IntermediateDirectory=".\release_obj" + Name="Release|x64" + OutputDirectory="Release" + IntermediateDirectory="mysqlmanager.dir\Release" ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OptimizeForProcessor="2" - AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include" - PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_WINDOWS;CONSOLE" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" + CompileAs="2" ExceptionHandling="FALSE" + InlineFunctionExpansion="2" + Optimization="2" RuntimeLibrary="0" - UsePrecompiledHeader="0" + RuntimeTypeInfo="TRUE" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"Release\""" + AssemblerListingLocation="Release" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/server-tools/instance-manager/Release/mysqlmanager.pdb" +/> <Tool Name="VCCustomBuildTool"/> <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"Release\"""/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"Release\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool Name="VCLinkerTool" - AdditionalDependencies="wsock32.lib" - OutputFile=".\release/mysqlmanager.exe" + AdditionalOptions=" /STACK:10000000 /machine:x64 /MAP /MAPINFO:EXPORTS /STACK:1048576" + AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib mysys.lib strings.lib taocrypt.lib vio.lib yassl.lib zlib.lib wsock32.lib " + OutputFile="Release\mysqlmanager.exe" + Version="0.0" + GenerateManifest="FALSE" LinkIncremental="1" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\release/mysqlmanager.pdb" - GenerateMapFile="TRUE" - MapFileName=".\release/mysqlmanager.map" + AdditionalLibraryDirectories="..\..\dbug\$(OutDir),..\..\dbug,..\..\mysys\$(OutDir),..\..\mysys,..\..\strings\$(OutDir),..\..\strings,..\..\extra\yassl\taocrypt\$(OutDir),..\..\extra\yassl\taocrypt,..\..\vio\$(OutDir),..\..\vio,..\..\extra\yassl\$(OutDir),..\..\extra\yassl,..\..\zlib\$(OutDir),..\..\zlib" + ProgramDataBaseFile="$(OutDir)\mysqlmanager.pdb" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1"/> + StackReserveSize="10000000"/> + </Configuration> + <Configuration + Name="MinSizeRel|x64" + OutputDirectory="MinSizeRel" + IntermediateDirectory="mysqlmanager.dir\MinSizeRel" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool - Name="VCMIDLTool"/> + Name="VCCLCompilerTool" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" + CompileAs="2" + ExceptionHandling="FALSE" + InlineFunctionExpansion="1" + Optimization="1" + RuntimeLibrary="2" + RuntimeTypeInfo="TRUE" + WarningLevel="3" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"MinSizeRel\""" + AssemblerListingLocation="MinSizeRel" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/server-tools/instance-manager/MinSizeRel/mysqlmanager.pdb" +/> <Tool - Name="VCPostBuildEventTool"/> + Name="VCCustomBuildTool"/> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"MinSizeRel\"""/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"MinSizeRel\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool - Name="VCResourceCompilerTool"/> + Name="VCPostBuildEventTool"/> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCLinkerTool" + AdditionalOptions=" /STACK:10000000 /machine:x64 /MAP /MAPINFO:EXPORTS /STACK:1048576" + AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib mysys.lib strings.lib taocrypt.lib vio.lib yassl.lib zlib.lib wsock32.lib " + OutputFile="MinSizeRel\mysqlmanager.exe" + Version="0.0" + GenerateManifest="FALSE" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\dbug\$(OutDir),..\..\dbug,..\..\mysys\$(OutDir),..\..\mysys,..\..\strings\$(OutDir),..\..\strings,..\..\extra\yassl\taocrypt\$(OutDir),..\..\extra\yassl\taocrypt,..\..\vio\$(OutDir),..\..\vio,..\..\extra\yassl\$(OutDir),..\..\extra\yassl,..\..\zlib\$(OutDir),..\..\zlib" + ProgramDataBaseFile="$(OutDir)\mysqlmanager.pdb" + SubSystem="1" + StackReserveSize="10000000"/> + </Configuration> + <Configuration + Name="RelWithDebInfo|x64" + OutputDirectory="RelWithDebInfo" + IntermediateDirectory="mysqlmanager.dir\RelWithDebInfo" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCCLCompilerTool" + AdditionalOptions=" /Zm1000 /wd4800 /wd4805 /wd4996" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" + CompileAs="2" + DebugInformationFormat="3" + ExceptionHandling="FALSE" + InlineFunctionExpansion="1" + Optimization="2" + RuntimeLibrary="0" + RuntimeTypeInfo="TRUE" + WarningLevel="3" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"RelWithDebInfo\""" + AssemblerListingLocation="RelWithDebInfo" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="R:/bug29125/my50-bug29125/server-tools/instance-manager/RelWithDebInfo/mysqlmanager.pdb" +/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="R:\bug29125\my50-bug29125\include;R:\bug29125\my50-bug29125\sql;R:\bug29125\my50-bug29125\extra\yassl\include;" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"RelWithDebInfo\"""/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,DBUG_OFF,CMAKE_BUILD,HAVE_YASSL,HAVE_ARCHIVE_DB,HAVE_BLACKHOLE_DB,HAVE_EXAMPLE_DB,HAVE_FEDERATED_DB,HAVE_INNOBASE_DB,__NT__,_WIN64,_WINDOWS,__WIN__,_CRT_SECURE_NO_DEPRECATE,_WIN64,MYSQL_SERVER,MYSQL_INSTANCE_MANAGER,"CMAKE_INTDIR=\"RelWithDebInfo\""" + MkTypLibCompatible="FALSE" + TargetEnvironment="3" + GenerateStublessProxies="TRUE" + TypeLibraryName="$(InputName).tlb" + OutputDirectory="$(IntDir)" + HeaderFileName="$(InputName).h" + DLLDataFileName="" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c"/> + <Tool + Name="VCManifestTool" + UseFAT32Workaround="true" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool"/> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCLinkerTool" + AdditionalOptions=" /STACK:10000000 /machine:x64 /MAP /MAPINFO:EXPORTS /STACK:1048576 /debug" + AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib mysys.lib strings.lib taocrypt.lib vio.lib yassl.lib zlib.lib wsock32.lib " + OutputFile="RelWithDebInfo\mysqlmanager.exe" + Version="0.0" + GenerateManifest="FALSE" + LinkIncremental="2" + AdditionalLibraryDirectories="..\..\dbug\$(OutDir),..\..\dbug,..\..\mysys\$(OutDir),..\..\mysys,..\..\strings\$(OutDir),..\..\strings,..\..\extra\yassl\taocrypt\$(OutDir),..\..\extra\yassl\taocrypt,..\..\vio\$(OutDir),..\..\vio,..\..\extra\yassl\$(OutDir),..\..\extra\yassl,..\..\zlib\$(OutDir),..\..\zlib" + ProgramDataBaseFile="$(OutDir)\mysqlmanager.pdb" + GenerateDebugInformation="TRUE" + SubSystem="1" + StackReserveSize="10000000"/> </Configuration> </Configurations> - <References> - </References> <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File - RelativePath=".\buffer.cpp"> - </File> - <File - RelativePath="..\..\sql\client.c"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt"> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/server-tools/instance-manager/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;R:\bug29125\my50-bug29125\win\mysql_manifest.cmake;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;" + Outputs="mysqlmanager.vcproj.cmake"/> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/server-tools/instance-manager/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;R:\bug29125\my50-bug29125\win\mysql_manifest.cmake;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;" + Outputs="mysqlmanager.vcproj.cmake"/> </FileConfiguration> - </File> - <File - RelativePath=".\command.cpp"> - </File> - <File - RelativePath=".\commands.cpp"> - </File> - <File - RelativePath="..\..\libmysql\get_password.c"> <FileConfiguration - Name="Debug|Win32"> + Name="MinSizeRel|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/server-tools/instance-manager/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;R:\bug29125\my50-bug29125\win\mysql_manifest.cmake;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;" + Outputs="mysqlmanager.vcproj.cmake"/> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="RelWithDebInfo|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCustomBuildTool" + Description="Building Custom Rule R:/bug29125/my50-bug29125/server-tools/instance-manager/CMakeLists.txt" + CommandLine=""C:\Program Files (x86)\CMake 2.4\bin\cmake.exe" -HR:/bug29125/my50-bug29125 -BR:/bug29125/my50-bug29125" + AdditionalDependencies="R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;R:\bug29125\my50-bug29125\win\mysql_manifest.cmake;"C:\Program Files (x86)\CMake 2.4\share\cmake-2.4\Templates\CMakeWindowsSystemConfig.cmake";R:\bug29125\my50-bug29125\server-tools\instance-manager\CMakeLists.txt;" + Outputs="mysqlmanager.vcproj.cmake"/> </FileConfiguration> </File> + <Filter + Name="Source Files" + Filter=""> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\buffer.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\command.cc"> + </File> <File - RelativePath=".\guardian.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\commands.cc"> </File> <File - RelativePath=".\IMService.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\guardian.cc"> </File> <File - RelativePath=".\instance.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\instance.cc"> </File> <File - RelativePath=".\instance_map.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\instance_map.cc"> </File> <File - RelativePath=".\instance_options.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\instance_options.cc"> </File> <File - RelativePath=".\listener.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\listener.cc"> </File> <File - RelativePath=".\log.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\log.cc"> </File> <File - RelativePath=".\manager.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\manager.cc"> </File> <File - RelativePath=".\messages.cpp"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\messages.cc"> </File> <File - RelativePath="..\..\sql\mini_client_errors.c"> + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\mysql_connection.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\mysqlmanager.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\options.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\parse.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\parse_output.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\priv.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\protocol.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\thread_registry.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\user_map.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\IMService.cpp"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\server-tools\instance-manager\WindowsService.cpp"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\sql\net_serv.cc"> + </File> + <File + RelativePath="R:\bug29125\my50-bug29125\sql-common\pack.c"> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> - </File> - <File - RelativePath=".\mysql_connection.cpp"> <FileConfiguration - Name="Debug|Win32"> + Name="MinSizeRel|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="RelWithDebInfo|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> </File> <File - RelativePath=".\mysqlmanager.cpp"> - </File> - <File - RelativePath="..\..\sql\net_serv.cpp"> + RelativePath="R:\bug29125\my50-bug29125\sql\password.c"> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> - </File> - <File - RelativePath=".\options.cpp"> - </File> - <File - RelativePath="..\..\sql\pack.c"> <FileConfiguration - Name="Debug|Win32"> + Name="MinSizeRel|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="RelWithDebInfo|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> </File> <File - RelativePath=".\parse.cpp"> - </File> - <File - RelativePath=".\parse_output.cpp"> - </File> - <File - RelativePath="..\..\sql\password.c"> + RelativePath="R:\bug29125\my50-bug29125\sql\sql_state.c"> <FileConfiguration - Name="Debug|Win32"> + Name="Debug|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> <FileConfiguration - Name="Release|Win32"> + Name="Release|x64"> <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj"/> + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="MinSizeRel|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="RelWithDebInfo|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> </FileConfiguration> </File> <File - RelativePath=".\priv.cpp"> - </File> - <File - RelativePath=".\protocol.cpp"> - </File> - <File - RelativePath="..\..\sql\sql_state.c"> - </File> - <File - RelativePath=".\thread_registry.cpp"> - </File> - <File - RelativePath=".\user_map.cpp"> - </File> - <File - RelativePath=".\WindowsService.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> - <File - RelativePath=".\buffer.h"> - </File> - <File - RelativePath=".\command.h"> - </File> - <File - RelativePath=".\commands.h"> - </File> - <File - RelativePath=".\factory.h"> - </File> - <File - RelativePath=".\guardian.h"> - </File> - <File - RelativePath=".\IMService.h"> - </File> - <File - RelativePath=".\instance.h"> - </File> - <File - RelativePath=".\instance_map.h"> - </File> - <File - RelativePath=".\instance_options.h"> - </File> - <File - RelativePath=".\listener.h"> - </File> - <File - RelativePath=".\log.h"> - </File> - <File - RelativePath=".\manager.h"> - </File> - <File - RelativePath=".\messages.h"> - </File> - <File - RelativePath=".\mysql_connection.h"> - </File> - <File - RelativePath=".\mysql_manager_error.h"> - </File> - <File - RelativePath=".\options.h"> - </File> - <File - RelativePath=".\parse.h"> - </File> - <File - RelativePath=".\parse_output.h"> - </File> - <File - RelativePath=".\portability.h"> - </File> - <File - RelativePath=".\priv.h"> - </File> - <File - RelativePath=".\protocol.h"> - </File> - <File - RelativePath=".\thread_registry.h"> + RelativePath="R:\bug29125\my50-bug29125\sql-common\client.c"> + <FileConfiguration + Name="Debug|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="MinSizeRel|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="RelWithDebInfo|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> </File> <File - RelativePath=".\user_map.h"> + RelativePath="R:\bug29125\my50-bug29125\libmysql\get_password.c"> + <FileConfiguration + Name="Debug|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="MinSizeRel|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="RelWithDebInfo|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> </File> <File - RelativePath=".\WindowsService.h"> + RelativePath="R:\bug29125\my50-bug29125\libmysql\errmsg.c"> + <FileConfiguration + Name="Debug|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="MinSizeRel|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> + <FileConfiguration + Name="RelWithDebInfo|x64"> + <Tool + Name="VCCLCompilerTool" + CompileAs="1" + /> + </FileConfiguration> </File> </Filter> </Files> diff -Nrup a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc --- a/server-tools/instance-manager/options.cc 2007-01-22 07:10:38 -05:00 +++ b/server-tools/instance-manager/options.cc 2008-04-09 12:43:35 -04:00 @@ -59,7 +59,7 @@ char **Options::saved_argv= NULL; bool Options::is_forced_default_file= 0; static const char * const ANGEL_PID_FILE_SUFFIX= ".angel.pid"; -static const int ANGEL_PID_FILE_SUFFIX_LEN= strlen(ANGEL_PID_FILE_SUFFIX); +static const int ANGEL_PID_FILE_SUFFIX_LEN= (uint) strlen(ANGEL_PID_FILE_SUFFIX); /* List of options, accepted by the instance manager. diff -Nrup a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc --- a/server-tools/instance-manager/parse.cc 2007-01-22 07:10:38 -05:00 +++ b/server-tools/instance-manager/parse.cc 2008-04-09 12:43:35 -04:00 @@ -177,7 +177,7 @@ Command *parse_command(Instance_map *map get_word(&text, &option_len, NONSPACE); option= text; if ((tmp= strchr(text, '=')) != NULL) - option_len= tmp - text; + option_len= (uint) (tmp - text); text+= option_len; get_word(&text, &word_len); diff -Nrup a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h --- a/server-tools/instance-manager/parse.h 2006-12-23 14:04:23 -05:00 +++ b/server-tools/instance-manager/parse.h 2008-04-09 12:43:35 -04:00 @@ -58,7 +58,7 @@ inline void get_word(const char **text, (*word_end != '\0')) ++word_end; - *word_len= word_end - *text; + *word_len= (uint) (word_end - *text); } #endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_PARSE_H */ diff -Nrup a/server-tools/instance-manager/parse_output.cc b/server-tools/instance-manager/parse_output.cc --- a/server-tools/instance-manager/parse_output.cc 2006-12-23 14:04:23 -05:00 +++ b/server-tools/instance-manager/parse_output.cc 2008-04-09 12:43:35 -04:00 @@ -30,11 +30,11 @@ void trim_space(const char **text, uint start++; *text= start; - int len= strlen(start); + size_t len= strlen(start); const char *end= start + len - 1; while (end > start && my_isspace(&my_charset_latin1, *end)) end--; - *word_len= (end - start)+1; + *word_len= (uint) (end - start)+1; } /* @@ -65,7 +65,7 @@ int parse_output_and_get_value(const cha uint flag) { FILE *output; - uint wordlen; + size_t wordlen; /* should be enough to store the string from the output */ enum { MAX_LINE_LEN= 512 }; char linebuf[MAX_LINE_LEN]; @@ -111,7 +111,7 @@ int parse_output_and_get_value(const cha strmake(result, linep, found_word_len); } else /* currently there are only two options */ - strmake(result, linep, input_buffer_len - 1); + strmake(result, linep, (uint) (input_buffer_len - 1)); rc= 0; break; } diff -Nrup a/server-tools/instance-manager/protocol.cc b/server-tools/instance-manager/protocol.cc --- a/server-tools/instance-manager/protocol.cc 2006-12-30 15:02:06 -05:00 +++ b/server-tools/instance-manager/protocol.cc 2008-04-09 12:43:35 -04:00 @@ -53,11 +53,11 @@ int net_send_ok(struct st_net *net, unsi int2store(pos, 0); pos+= 2; - uint position= pos - buff.buffer; /* we might need it for message */ + uint position= (uint) (pos - buff.buffer); /* we might need it for message */ if (message != NULL) { - buff.reserve(position, 9 + strlen(message)); + buff.reserve(position, 9 + (uint) strlen(message)); store_to_protocol_packet(&buff, message, &position); } @@ -82,7 +82,7 @@ int net_send_error(struct st_net *net, u memcpy(pos, errno_to_sqlstate(sql_errno), SQLSTATE_LENGTH); pos+= SQLSTATE_LENGTH; pos= strmake(pos, err, MYSQL_ERRMSG_SIZE - 1) + 1; - return my_net_write(net, buff, pos - buff) || net_flush(net); + return my_net_write(net, buff, (uint) (pos - buff)) || net_flush(net); } @@ -98,7 +98,7 @@ int net_send_error_323(struct st_net *ne int2store(pos, sql_errno); pos+= 2; pos= strmake(pos, err, MYSQL_ERRMSG_SIZE - 1) + 1; - return my_net_write(net, buff, pos - buff) || net_flush(net); + return my_net_write(net, buff, (uint) (pos - buff)) || net_flush(net); } char *net_store_length(char *pkg, uint length) @@ -123,7 +123,7 @@ int store_to_protocol_packet(Buffer *buf /* reserve max amount of bytes needed to store length */ if (buf->reserve(*position, 9)) goto err; - currpos= (net_store_length(buf->buffer + *position, + currpos= (uint) (net_store_length(buf->buffer + *position, (ulonglong) string_len) - buf->buffer); if (buf->append(currpos, string, string_len)) goto err; @@ -139,7 +139,7 @@ int store_to_protocol_packet(Buffer *buf { uint string_len; - string_len= strlen(string); + string_len= (uint) strlen(string); return store_to_protocol_packet(buf, string, position, string_len); } diff -Nrup a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc --- a/server-tools/instance-manager/user_map.cc 2007-01-22 07:10:38 -05:00 +++ b/server-tools/instance-manager/user_map.cc 2008-04-09 12:43:35 -04:00 @@ -55,7 +55,7 @@ int User::init(const char *line) goto err; password= name_end + 1; } - user_length= name_end - name_begin; + user_length= (uint) (name_end - name_begin); if (user_length > USERNAME_LENGTH) goto err; diff -Nrup a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc --- a/sql/gen_lex_hash.cc 2007-01-29 08:27:17 -05:00 +++ b/sql/gen_lex_hash.cc 2008-04-09 12:43:35 -04:00 @@ -199,7 +199,7 @@ void insert_symbols() for (cur= symbols; i<array_elements(symbols); cur++, i++){ hash_lex_struct *root= get_hash_struct_by_len(&root_by_len,cur->length,&max_len); - insert_into_hash(root,cur->name,0,i,0); + insert_into_hash(root,cur->name,0,(uint) i,0); } } @@ -511,7 +511,7 @@ static inline SYMBOL *get_hash_symbol(co res= symbols+ires;\n\ else\n\ res= sql_functions-ires-1;\n\ - register uint count= cur_str-s;\n\ + register uint count= (uint) (cur_str - s);\n\ return lex_casecmp(cur_str,res->name+count,len-count) ? 0 : res;\n\ }\n\ \n\ @@ -540,7 +540,7 @@ static inline SYMBOL *get_hash_symbol(co register int16 ires= (int16)(cur_struct>>16);\n\ if (ires==array_elements(symbols)) return 0;\n\ register SYMBOL *res= symbols+ires;\n\ - register uint count= cur_str-s;\n\ + register uint count= (uint) (cur_str - s);\n\ return lex_casecmp(cur_str,res->name+count,len-count)!=0 ? 0 : res;\n\ }\n\ \n\ diff -Nrup a/sql/ha_archive.cc b/sql/ha_archive.cc --- a/sql/ha_archive.cc 2007-06-27 04:19:32 -04:00 +++ b/sql/ha_archive.cc 2008-04-09 12:43:35 -04:00 @@ -851,7 +851,7 @@ int ha_archive::get_row(gzFile file_to_r total_blob_length += ((Field_blob*) table->field[*ptr])->get_length(); /* Adjust our row buffer if we need be */ - buffer.alloc(total_blob_length); + buffer.alloc((uint) total_blob_length); last= (char *)buffer.ptr(); /* Loop through our blobs and read them */ @@ -862,10 +862,10 @@ int ha_archive::get_row(gzFile file_to_r size_t size= ((Field_blob*) table->field[*ptr])->get_length(); if (size) { - read= gzread(file_to_read, last, size); + read= gzread(file_to_read, last, (uint) size); if ((size_t) read != size) DBUG_RETURN(HA_ERR_END_OF_FILE); - ((Field_blob*) table->field[*ptr])->set_ptr(size, last); + ((Field_blob*) table->field[*ptr])->set_ptr((uint) size, last); last += size; } } diff -Nrup a/sql/ha_federated.cc b/sql/ha_federated.cc --- a/sql/ha_federated.cc 2008-03-29 03:52:03 -04:00 +++ b/sql/ha_federated.cc 2008-04-09 12:43:35 -04:00 @@ -637,7 +637,7 @@ static int parse_url(FEDERATED_SHARE *sh share->database[share->table_name - share->database]= '\0'; share->table_name++; - share->table_name_length= strlen(share->table_name); + share->table_name_length= (uint) strlen(share->table_name); /* make sure there's not an extra / */ if ((strchr(share->table_name, '/'))) @@ -723,7 +723,7 @@ uint ha_federated::convert_row_to_intern index variable to move us through the row at the same iterative step as the field */ - int x= field - table->field; + size_t x= (field - table->field); my_ptrdiff_t old_ptr; old_ptr= (my_ptrdiff_t) (record - table->record[0]); (*field)->move_field(old_ptr); @@ -744,7 +744,7 @@ static bool emit_key_part_name(String *t { DBUG_ENTER("emit_key_part_name"); if (append_ident(to, part->field->field_name, - strlen(part->field->field_name), ident_quote_char)) + (uint) strlen(part->field->field_name), ident_quote_char)) DBUG_RETURN(1); // Out of memory DBUG_RETURN(0); } @@ -1284,13 +1284,13 @@ static FEDERATED_SHARE *get_share(const for (field= table->field; *field; field++) { append_ident(&query, (*field)->field_name, - strlen((*field)->field_name), ident_quote_char); + (uint) strlen((*field)->field_name), ident_quote_char); query.append(FEDERATED_COMMA); } - query.length(query.length()- strlen(FEDERATED_COMMA)); + query.length(query.length() - (uint) strlen(FEDERATED_COMMA)); query.append(FEDERATED_FROM); - tmp_share.table_name_length= strlen(tmp_share.table_name); + tmp_share.table_name_length= (uint) strlen(tmp_share.table_name); append_ident(&query, tmp_share.table_name, tmp_share.table_name_length, ident_quote_char); @@ -1514,7 +1514,7 @@ bool ha_federated::append_stmt_insert(St append_ident(&insert_string, share->table_name, share->table_name_length, ident_quote_char); insert_string.append(FEDERATED_OPENPAREN); - tmp_length= insert_string.length() - strlen(FEDERATED_COMMA); + tmp_length= insert_string.length() - (uint) strlen(FEDERATED_COMMA); /* loop through the field pointer array, add any fields to both the values @@ -1524,7 +1524,7 @@ bool ha_federated::append_stmt_insert(St { /* append the field name */ append_ident(&insert_string, (*field)->field_name, - strlen((*field)->field_name), ident_quote_char); + (uint) strlen((*field)->field_name), ident_quote_char); /* append commas between both fields and fieldnames */ /* @@ -1540,7 +1540,7 @@ bool ha_federated::append_stmt_insert(St /* remove trailing comma */ - insert_string.length(insert_string.length() - strlen(FEDERATED_COMMA)); + insert_string.length(insert_string.length() - (uint) strlen(FEDERATED_COMMA)); /* if there were no fields, we don't want to add a closing paren @@ -1653,7 +1653,7 @@ int ha_federated::write_row(byte *buf) if (values_string.length() > tmp_length) { /* chops off leading commas */ - values_string.length(values_string.length() - strlen(FEDERATED_COMMA)); + values_string.length(values_string.length() - (uint) strlen(FEDERATED_COMMA)); } /* we always want to append this, even if there aren't any fields */ values_string.append(FEDERATED_CLOSEPAREN); @@ -1936,10 +1936,10 @@ int ha_federated::update_row(const byte for (Field **field= table->field; *field; field++) { - uint field_name_length= strlen((*field)->field_name); - append_ident(&where_string, (*field)->field_name, field_name_length, + size_t field_name_length= strlen((*field)->field_name); + append_ident(&where_string, (*field)->field_name, (uint) field_name_length, ident_quote_char); - append_ident(&update_string, (*field)->field_name, field_name_length, + append_ident(&update_string, (*field)->field_name, (uint) field_name_length, ident_quote_char); update_string.append(FEDERATED_EQ); @@ -2030,7 +2030,7 @@ int ha_federated::delete_row(const byte Field *cur_field= *field; data_string.length(0); append_ident(&delete_string, (*field)->field_name, - strlen((*field)->field_name), ident_quote_char); + (uint) strlen((*field)->field_name), ident_quote_char); if (cur_field->is_null()) { @@ -2345,7 +2345,7 @@ int ha_federated::rnd_init(bool scan) stored_result= 0; } - if (real_query(share->select_query, strlen(share->select_query))) + if (real_query(share->select_query, (uint) strlen(share->select_query))) goto error; stored_result= mysql_store_result(mysql); diff -Nrup a/sql/ha_innodb.cc b/sql/ha_innodb.cc --- a/sql/ha_innodb.cc 2008-03-29 03:52:03 -04:00 +++ b/sql/ha_innodb.cc 2008-04-09 12:43:35 -04:00 @@ -6996,7 +6996,7 @@ ha_innobase::get_error_message(int error { trx_t* trx = check_trx_exists(current_thd); - buf->copy(trx->detailed_error, strlen(trx->detailed_error), + buf->copy(trx->detailed_error, (uint) strlen(trx->detailed_error), system_charset_info); return FALSE; diff -Nrup a/sql/handler.cc b/sql/handler.cc --- a/sql/handler.cc 2008-02-06 21:09:59 -05:00 +++ b/sql/handler.cc 2008-04-09 12:43:35 -04:00 @@ -188,7 +188,8 @@ retest: { if (!my_strnncoll(&my_charset_latin1, (const uchar *)name, namelen, - (const uchar *)(*types)->name, strlen((*types)->name))) + (const uchar *)(*types)->name, + (uint) strlen((*types)->name))) return (enum db_type) (*types)->db_type; } @@ -200,10 +201,10 @@ retest: if (!my_strnncoll(&my_charset_latin1, (const uchar *)name, namelen, (const uchar *)table_alias->alias, - strlen(table_alias->alias))) + (uint) strlen(table_alias->alias))) { name= table_alias->type; - namelen= strlen(name); + namelen= (uint) strlen(name); goto retest; } } diff -Nrup a/sql/item.cc b/sql/item.cc --- a/sql/item.cc 2008-03-28 07:31:48 -04:00 +++ b/sql/item.cc 2008-04-09 12:43:35 -04:00 @@ -6212,7 +6212,7 @@ bool Item_trigger_field::fix_fields(THD if (check_grant_column(thd, table_grants, triggers->trigger_table->s->db, triggers->trigger_table->s->table_name, field_name, - strlen(field_name), thd->security_ctx)) + (uint) strlen(field_name), thd->security_ctx)) return TRUE; } #endif // NO_EMBEDDED_ACCESS_CHECKS diff -Nrup a/sql/item_func.cc b/sql/item_func.cc --- a/sql/item_func.cc 2008-03-29 11:50:43 -04:00 +++ b/sql/item_func.cc 2008-04-09 12:43:35 -04:00 @@ -2755,7 +2755,7 @@ longlong Item_func_find_in_set::val_int( if (is_last_item && !is_separator) str_end= substr_end; if (!my_strnncoll(cs, (const uchar *) str_begin, - str_end - str_begin, + (uint) (str_end - str_begin), find_str, find_str_len)) return (longlong) position; else @@ -4780,7 +4780,7 @@ Item_func_get_system_var(sys_var *var_ar :var(var_arg), var_type(var_type_arg), component(*component_arg) { /* set_name() will allocate the name */ - set_name(name_arg, name_len_arg, system_charset_info); + set_name(name_arg, (uint) name_len_arg, system_charset_info); } diff -Nrup a/sql/item_strfunc.cc b/sql/item_strfunc.cc --- a/sql/item_strfunc.cc 2007-10-11 07:07:09 -04:00 +++ b/sql/item_strfunc.cc 2008-04-09 12:43:35 -04:00 @@ -1731,17 +1731,17 @@ bool Item_func_user::init(const char *us if (user) { CHARSET_INFO *cs= str_value.charset(); - uint res_length= (strlen(user)+strlen(host)+2) * cs->mbmaxlen; + size_t res_length= (strlen(user)+strlen(host)+2) * cs->mbmaxlen; - if (str_value.alloc(res_length)) + if (str_value.alloc((uint) res_length)) { null_value=1; return TRUE; } - res_length=cs->cset->snprintf(cs, (char*)str_value.ptr(), res_length, + res_length=cs->cset->snprintf(cs, (char*)str_value.ptr(), (uint) res_length, "%s@%s", user, host); - str_value.length(res_length); + str_value.length((uint) res_length); str_value.mark_as_const(); } return FALSE; @@ -2421,7 +2421,7 @@ String *Item_func_rpad::val_str(String * memcpy(to,ptr_pad,(size_t) pad_byte_length); to+= pad_byte_length; } - res->length(to- (char*) res->ptr()); + res->length((uint) (to- (char*) res->ptr())); return (res); err: @@ -2689,7 +2689,7 @@ String *Item_func_charset::val_str(Strin CHARSET_INFO *cs= args[0]->collation.collation; null_value= 0; - str->copy(cs->csname, strlen(cs->csname), + str->copy(cs->csname, (uint) strlen(cs->csname), &my_charset_latin1, collation.collation, &dummy_errors); return str; } @@ -2701,7 +2701,7 @@ String *Item_func_collation::val_str(Str CHARSET_INFO *cs= args[0]->collation.collation; null_value= 0; - str->copy(cs->name, strlen(cs->name), + str->copy(cs->name, (uint) strlen(cs->name), &my_charset_latin1, collation.collation, &dummy_errors); return str; } diff -Nrup a/sql/item_strfunc.h b/sql/item_strfunc.h --- a/sql/item_strfunc.h 2008-01-23 10:01:28 -05:00 +++ b/sql/item_strfunc.h 2008-04-09 12:43:35 -04:00 @@ -362,7 +362,7 @@ public: Item_func_encode(Item *a, char *seed_arg): Item_str_func(a), sql_crypt(seed_arg) { - seed.copy(seed_arg, strlen(seed_arg), default_charset_info); + seed.copy(seed_arg, (uint) strlen(seed_arg), default_charset_info); } String *val_str(String *); void fix_length_and_dec(); diff -Nrup a/sql/item_timefunc.cc b/sql/item_timefunc.cc --- a/sql/item_timefunc.cc 2008-01-23 13:48:27 -05:00 +++ b/sql/item_timefunc.cc 2008-04-09 12:43:35 -04:00 @@ -384,7 +384,7 @@ static bool extract_date_time(DATE_TIME_ if (tmp - val > 6) tmp= (char*) val + 6; l_time->second_part= (int) my_strtoll10(val, &tmp, &error); - frac_part= 6 - (tmp - val); + frac_part= 6 - (uint) (tmp - val); if (frac_part > 0) l_time->second_part*= (ulong) log_10_int[frac_part]; val= tmp; @@ -635,14 +635,14 @@ bool make_date_time(DATE_TIME_FORMAT *fo if (!l_time->month) return 1; str->append(locale->month_names->type_names[l_time->month-1], - strlen(locale->month_names->type_names[l_time->month-1]), + (uint) strlen(locale->month_names->type_names[l_time->month-1]), system_charset_info); break; case 'b': if (!l_time->month) return 1; str->append(locale->ab_month_names->type_names[l_time->month-1], - strlen(locale->ab_month_names->type_names[l_time->month-1]), + (uint) strlen(locale->ab_month_names->type_names[l_time->month-1]), system_charset_info); break; case 'W': @@ -651,7 +651,7 @@ bool make_date_time(DATE_TIME_FORMAT *fo weekday= calc_weekday(calc_daynr(l_time->year,l_time->month, l_time->day),0); str->append(locale->day_names->type_names[weekday], - strlen(locale->day_names->type_names[weekday]), + (uint) strlen(locale->day_names->type_names[weekday]), system_charset_info); break; case 'a': @@ -660,13 +660,13 @@ bool make_date_time(DATE_TIME_FORMAT *fo weekday=calc_weekday(calc_daynr(l_time->year,l_time->month, l_time->day),0); str->append(locale->ab_day_names->type_names[weekday], - strlen(locale->ab_day_names->type_names[weekday]), + (uint) strlen(locale->ab_day_names->type_names[weekday]), system_charset_info); break; case 'D': if (type == MYSQL_TIMESTAMP_TIME) return 1; - length= int10_to_str(l_time->day, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->day, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 1, '0'); if (l_time->day >= 10 && l_time->day <= 19) str->append(STRING_WITH_LEN("th")); @@ -689,62 +689,62 @@ bool make_date_time(DATE_TIME_FORMAT *fo } break; case 'Y': - length= int10_to_str(l_time->year, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->year, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 4, '0'); break; case 'y': - length= int10_to_str(l_time->year%100, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->year%100, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); break; case 'm': - length= int10_to_str(l_time->month, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->month, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); break; case 'c': - length= int10_to_str(l_time->month, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->month, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 1, '0'); break; case 'd': - length= int10_to_str(l_time->day, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->day, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); break; case 'e': - length= int10_to_str(l_time->day, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->day, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 1, '0'); break; case 'f': - length= int10_to_str(l_time->second_part, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->second_part, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 6, '0'); break; case 'H': - length= int10_to_str(l_time->hour, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->hour, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); break; case 'h': case 'I': hours_i= (l_time->hour%24 + 11)%12+1; - length= int10_to_str(hours_i, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(hours_i, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); break; case 'i': /* minutes */ - length= int10_to_str(l_time->minute, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->minute, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); break; case 'j': if (type == MYSQL_TIMESTAMP_TIME) return 1; - length= int10_to_str(calc_daynr(l_time->year,l_time->month, + length= (uint) (int10_to_str(calc_daynr(l_time->year,l_time->month, l_time->day) - - calc_daynr(l_time->year,1,1) + 1, intbuff, 10) - intbuff; + calc_daynr(l_time->year,1,1) + 1, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 3, '0'); break; case 'k': - length= int10_to_str(l_time->hour, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->hour, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 1, '0'); break; case 'l': hours_i= (l_time->hour%24 + 11)%12+1; - length= int10_to_str(hours_i, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(hours_i, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 1, '0'); break; case 'p': @@ -763,7 +763,7 @@ bool make_date_time(DATE_TIME_FORMAT *fo break; case 'S': case 's': - length= int10_to_str(l_time->second, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(l_time->second, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); break; case 'T': @@ -781,11 +781,11 @@ bool make_date_time(DATE_TIME_FORMAT *fo uint year; if (type == MYSQL_TIMESTAMP_TIME) return 1; - length= int10_to_str(calc_week(l_time, + length= (uint) (int10_to_str(calc_week(l_time, (*ptr) == 'U' ? WEEK_FIRST_WEEKDAY : WEEK_MONDAY_FIRST, &year), - intbuff, 10) - intbuff; + intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); } break; @@ -795,12 +795,12 @@ bool make_date_time(DATE_TIME_FORMAT *fo uint year; if (type == MYSQL_TIMESTAMP_TIME) return 1; - length= int10_to_str(calc_week(l_time, + length= (uint) (int10_to_str(calc_week(l_time, ((*ptr) == 'V' ? (WEEK_YEAR | WEEK_FIRST_WEEKDAY) : (WEEK_YEAR | WEEK_MONDAY_FIRST)), &year), - intbuff, 10) - intbuff; + intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 2, '0'); } break; @@ -815,7 +815,7 @@ bool make_date_time(DATE_TIME_FORMAT *fo WEEK_YEAR | WEEK_FIRST_WEEKDAY : WEEK_YEAR | WEEK_MONDAY_FIRST), &year); - length= int10_to_str(year, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(year, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 4, '0'); } break; @@ -824,7 +824,7 @@ bool make_date_time(DATE_TIME_FORMAT *fo return 1; weekday=calc_weekday(calc_daynr(l_time->year,l_time->month, l_time->day),1); - length= int10_to_str(weekday, intbuff, 10) - intbuff; + length= (uint) (int10_to_str(weekday, intbuff, 10) - intbuff); str->append_with_prefill(intbuff, length, 1, '0'); break; @@ -875,7 +875,7 @@ static bool get_interval_info(const char value= value*LL(10) + (longlong) (*str - '0'); if (transform_msec && i == count - 1) // microseconds always last { - long msec_length= 6 - (str - start); + long msec_length= 6 - (uint) (str - start); if (msec_length > 0) value*= (long) log_10_int[msec_length]; } @@ -1050,7 +1050,7 @@ String* Item_func_monthname::val_str(Str } null_value=0; month_name= thd->variables.lc_time_names->month_names->type_names[month-1]; - str->set(month_name, strlen(month_name), system_charset_info); + str->set(month_name, (uint) strlen(month_name), system_charset_info); return str; } @@ -1181,7 +1181,7 @@ String* Item_func_dayname::val_str(Strin return (String*) 0; day_name= thd->variables.lc_time_names->day_names->type_names[weekday]; - str->set(day_name, strlen(day_name), system_charset_info); + str->set(day_name, (uint) strlen(day_name), system_charset_info); return str; } @@ -3192,14 +3192,14 @@ String *Item_func_get_format::val_str(St format++) { uint format_name_len; - format_name_len= strlen(format_name); + format_name_len= (uint) strlen(format_name); if (val_len == format_name_len && !my_strnncoll(&my_charset_latin1, (const uchar *) val->ptr(), val_len, (const uchar *) format_name, val_len)) { const char *format_str= get_date_time_format_str(format, type); - str->set(format_str, strlen(format_str), &my_charset_bin); + str->set(format_str, (uint) strlen(format_str), &my_charset_bin); return str; } } diff -Nrup a/sql/lock.cc b/sql/lock.cc --- a/sql/lock.cc 2008-03-29 11:50:43 -04:00 +++ b/sql/lock.cc 2008-04-09 12:43:35 -04:00 @@ -347,7 +347,7 @@ void mysql_unlock_read_tables(THD *thd, for (i= 0; i < sql_lock->table_count; i++) { TABLE *tbl= *table; - tbl->lock_position= table - sql_lock->table; + tbl->lock_position= (uint) (table - sql_lock->table); tbl->lock_data_start= found; found+= tbl->lock_count; table++; @@ -740,7 +740,7 @@ static MYSQL_LOCK *get_lock_data(THD *th { my_error(ER_OPEN_AS_READONLY,MYF(0),table->alias); /* Clear the lock type of the lock data that are stored already. */ - sql_lock->lock_count= locks - sql_lock->locks; + sql_lock->lock_count= (uint) (locks - sql_lock->locks); reset_lock_data(sql_lock); my_free((gptr) sql_lock,MYF(0)); DBUG_RETURN(0); diff -Nrup a/sql/log.cc b/sql/log.cc --- a/sql/log.cc 2008-03-21 10:10:11 -04:00 +++ b/sql/log.cc 2008-04-09 12:43:35 -04:00 @@ -486,7 +486,7 @@ const char *MYSQL_LOG::generate_name(con { if (!log_name || !log_name[0]) { - strmake(buff, pidfile_name, FN_REFLEN - strlen(suffix) - 1); + strmake(buff, pidfile_name, (uint) (FN_REFLEN - strlen(suffix) - 1)); return (const char *) fn_format(buff, buff, "", suffix, MYF(MY_REPLACE_EXT|MY_REPLACE_DIR)); @@ -727,7 +727,7 @@ bool MYSQL_LOG::open(const char *log_nam file. As every time we write to the index file, we sync it. */ if (my_b_write(&index_file, (byte*) log_file_name, - strlen(log_file_name)) || + (uint) strlen(log_file_name)) || my_b_write(&index_file, (byte*) "\n", 1) || flush_io_cache(&index_file) || my_sync(index_file.file, MYF(MY_WME))) diff -Nrup a/sql/log_event.cc b/sql/log_event.cc --- a/sql/log_event.cc 2008-03-18 08:38:10 -04:00 +++ b/sql/log_event.cc 2008-04-09 12:43:35 -04:00 @@ -268,7 +268,7 @@ append_query_string(CHARSET_INFO *csinfo from->ptr(), from->length()); *ptr++='\''; } - to->length(orig_len + ptr - beg); + to->length((uint) (orig_len + ptr - beg)); return 0; } #endif @@ -556,7 +556,7 @@ int Log_event::net_send(Protocol *protoc protocol->store(log_name, &my_charset_bin); protocol->store((ulonglong) pos); event_type = get_type_str(); - protocol->store(event_type, strlen(event_type), &my_charset_bin); + protocol->store(event_type, (uint) strlen(event_type), &my_charset_bin); protocol->store((uint32) server_id); protocol->store((ulonglong) log_pos); pack_info(protocol); @@ -1106,7 +1106,7 @@ void Query_log_event::pack_info(Protocol memcpy(pos, query, q_len); pos+= q_len; } - protocol->store(buf, pos-buf, &my_charset_bin); + protocol->store(buf, (uint) (pos - buf), &my_charset_bin); my_free(buf, MYF(MY_ALLOW_ZERO_PTR)); } #endif @@ -1437,7 +1437,7 @@ get_str_len_and_pointer(const Log_event: if (length > 0) { if (*src + length >= end) - return *src + length - end + 1; // Number of bytes missing + return (int) (*src + length - end + 1); // Number of bytes missing *dst= (char *)*src + 1; // Will be copied later } *len= length; @@ -1908,7 +1908,7 @@ int Query_log_event::exec_event(struct s Thank you. */ thd->catalog= catalog_len ? (char *) catalog : (char *)""; - thd->set_db(new_db, strlen(new_db)); /* allocates a copy of 'db' */ + thd->set_db(new_db, (uint) strlen(new_db)); /* allocates a copy of 'db' */ thd->variables.auto_increment_increment= auto_increment_increment; thd->variables.auto_increment_offset= auto_increment_offset; @@ -2771,7 +2771,7 @@ void Load_log_event::pack_info(Protocol if (!(buf= my_malloc(get_query_buffer_length(), MYF(MY_WME)))) return; print_query(TRUE, buf, &end, 0, 0); - protocol->store(buf, end-buf, &my_charset_bin); + protocol->store(buf, (uint) (end - buf), &my_charset_bin); my_free(buf, MYF(0)); } #endif /* defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) */ @@ -2978,7 +2978,7 @@ int Load_log_event::copy_log_event(const table_name = fields + field_block_len; db = table_name + table_name_len + 1; fname = db + db_len + 1; - fname_len = strlen(fname); + fname_len = (uint) strlen(fname); // null termination is accomplished by the caller doing buf[event_len]=0 DBUG_RETURN(0); @@ -3144,7 +3144,7 @@ int Load_log_event::exec_event(NET* net, bool use_rli_only_for_errors) { const char *new_db= rewrite_db(db); - thd->set_db(new_db, strlen(new_db)); + thd->set_db(new_db, (uint) strlen(new_db)); DBUG_ASSERT(thd->query == 0); thd->query_length= 0; // Should not be needed thd->query_error= 0; @@ -3237,7 +3237,7 @@ int Load_log_event::exec_event(NET* net, print_query(FALSE, load_data_query, &end, (char **)&thd->lex->fname_start, (char **)&thd->lex->fname_end); *end= 0; - thd->query_length= end - load_data_query; + thd->query_length= (uint) (end - load_data_query); thd->query= load_data_query; if (sql_ex.opt_flags & REPLACE_FLAG) @@ -3857,7 +3857,7 @@ void User_var_log_event::pack_info(Proto break; case INT_RESULT: buf= my_malloc(val_offset + 22, MYF(MY_WME)); - event_len= longlong10_to_str(uint8korr(val), buf + val_offset,-10)-buf; + event_len= (uint) (longlong10_to_str(uint8korr(val), buf + val_offset,-10) - buf); break; case DECIMAL_RESULT: { @@ -3883,7 +3883,7 @@ void User_var_log_event::pack_info(Proto char *p= strxmov(buf + val_offset, "_", cs->csname, " ", NullS); p= str_to_hex(p, val, val_len); p= strxmov(p, " COLLATE ", cs->name, NullS); - event_len= p-buf; + event_len= (uint) (p - buf); } break; case ROW_RESULT: @@ -4198,7 +4198,7 @@ void Slave_log_event::pack_info(Protocol pos= strmov(pos, master_log); pos= strmov(pos, ",pos="); pos= longlong10_to_str(master_pos, pos, 10); - protocol->store(buf, pos-buf, &my_charset_bin); + protocol->store(buf, (uint) (pos - buf), &my_charset_bin); } #endif /* !MYSQL_CLIENT */ @@ -4216,8 +4216,8 @@ Slave_log_event::Slave_log_event(THD* th // TODO: re-write this better without holding both locks at the same time pthread_mutex_lock(&mi->data_lock); pthread_mutex_lock(&rli->data_lock); - master_host_len = strlen(mi->host); - master_log_len = strlen(rli->group_master_log_name); + master_host_len= (uint) strlen(mi->host); + master_log_len= (uint) strlen(rli->group_master_log_name); // on OOM, just do not initialize the structure and print the error if ((mem_pool = (char*)my_malloc(get_data_size() + 1, MYF(MY_WME)))) @@ -4286,7 +4286,7 @@ void Slave_log_event::init_from_mem_pool master_pos = uint8korr(mem_pool + SL_MASTER_POS_OFFSET); master_port = uint2korr(mem_pool + SL_MASTER_PORT_OFFSET); master_host = mem_pool + SL_MASTER_HOST_OFFSET; - master_host_len = strlen(master_host); + master_host_len= (uint) strlen(master_host); // safety master_log = master_host + master_host_len + 1; if (master_log > mem_pool + data_size) @@ -4294,7 +4294,7 @@ void Slave_log_event::init_from_mem_pool master_host = 0; return; } - master_log_len = strlen(master_log); + master_log_len= (uint) strlen(master_log); } @@ -5216,7 +5216,7 @@ void Execute_load_query_log_event::pack_ } pos= strmov(pos, " ;file_id="); pos= int10_to_str((long) file_id, pos, 10); - protocol->store(buf, pos-buf, &my_charset_bin); + protocol->store(buf, (uint) (pos - buf), &my_charset_bin); my_free(buf, MYF(MY_ALLOW_ZERO_PTR)); } @@ -5259,7 +5259,7 @@ Execute_load_query_log_event::exec_event p= strmake(p, STRING_WITH_LEN(" INTO")); p= strmake(p, query+fn_pos_end, q_len-fn_pos_end); - error= Query_log_event::exec_event(rli, buf, p-buf); + error= Query_log_event::exec_event(rli, buf, (uint) (p - buf)); /* Forging file name for deletion in same buffer */ *fname_end= 0; diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc --- a/sql/mysqld.cc 2008-03-29 10:12:21 -04:00 +++ b/sql/mysqld.cc 2008-04-09 12:43:35 -04:00 @@ -2809,7 +2809,7 @@ static bool init_global_datetime_format( */ opt_date_time_formats[format_type]= str; } - if (!(*var_ptr= date_time_format_make(format_type, str, strlen(str)))) + if (!(*var_ptr= date_time_format_make(format_type, str, (uint) strlen(str)))) { fprintf(stderr, "Wrong date/time format specifier: %s\n", str); return 1; @@ -3028,13 +3028,13 @@ static int init_common_variables(const c sys_init_connect.value_length= 0; if ((sys_init_connect.value= opt_init_connect)) - sys_init_connect.value_length= strlen(opt_init_connect); + sys_init_connect.value_length= (uint) strlen(opt_init_connect); else sys_init_connect.value=my_strdup("",MYF(0)); sys_init_slave.value_length= 0; if ((sys_init_slave.value= opt_init_slave)) - sys_init_slave.value_length= strlen(opt_init_slave); + sys_init_slave.value_length= (uint) strlen(opt_init_slave); else sys_init_slave.value=my_strdup("",MYF(0)); @@ -7270,7 +7270,7 @@ get_one_option(int optid, const struct m case OPT_STORAGE_ENGINE: { if ((enum db_type)((global_system_variables.table_type= - ha_resolve_by_name(argument, strlen(argument)))) == + ha_resolve_by_name(argument, (uint) strlen(argument)))) == DB_TYPE_UNKNOWN) { fprintf(stderr,"Unknown/unsupported table type: %s\n",argument); diff -Nrup a/sql/net_serv.cc b/sql/net_serv.cc --- a/sql/net_serv.cc 2008-03-28 14:02:23 -04:00 +++ b/sql/net_serv.cc 2008-04-09 12:43:35 -04:00 @@ -253,7 +253,7 @@ static int net_data_is_ready(my_socket s tv.tv_sec= tv.tv_usec= 0; - if ((res= select(sd+1, &sfds, NULL, NULL, &tv)) < 0) + if ((res= select((int) (sd + 1), &sfds, NULL, NULL, &tv)) < 0) return 0; else return test(res ? FD_ISSET(sd, &sfds) : 0); @@ -501,7 +501,7 @@ net_write_buff(NET *net,const char *pack { ulong left_length; if (net->compress && net->max_packet > MAX_PACKET_LENGTH) - left_length= MAX_PACKET_LENGTH - (net->write_pos - net->buff); + left_length= (ulong) (MAX_PACKET_LENGTH - (net->write_pos - net->buff)); else left_length= (ulong) (net->buff_end - net->write_pos); diff -Nrup a/sql/opt_range.cc b/sql/opt_range.cc --- a/sql/opt_range.cc 2008-03-28 14:02:23 -04:00 +++ b/sql/opt_range.cc 2008-04-09 12:43:35 -04:00 @@ -671,7 +671,7 @@ int SEL_IMERGE::or_sel_tree(PARAM *param if (trees_next == trees_end) { const int realloc_ratio= 2; /* Double size for next round */ - uint old_elements= (trees_end - trees); + uint old_elements= (uint) (trees_end - trees); uint old_size= sizeof(SEL_TREE**) * old_elements; uint new_size= old_size * realloc_ratio; SEL_TREE **new_trees; @@ -2325,7 +2325,7 @@ TABLE_READ_PLAN *get_best_disjunct_quick { SEL_TREE **ptree; TRP_INDEX_MERGE *imerge_trp= NULL; - uint n_child_scans= imerge->trees_next - imerge->trees; + uint n_child_scans= (uint) (imerge->trees_next - imerge->trees); TRP_RANGE **range_scans; TRP_RANGE **cur_child; TRP_RANGE **cpk_scan= NULL; @@ -2924,7 +2924,7 @@ static double ror_scan_selectivity(const tuple_arg= tuple_arg->next_key_part; tuple_arg->store_min(key_part[tuple_arg->part].store_length, &key_ptr, 0); } - min_range.length= max_range.length= ((char*) key_ptr - (char*) key_val); + min_range.length= max_range.length= (uint) ((char*) key_ptr - (char*) key_val); records= (info->param->table->file-> records_in_range(scan->keynr, &min_range, &max_range)); if (cur_covered) @@ -3224,7 +3224,7 @@ TRP_ROR_INTERSECT *get_best_ror_intersec intersect_scans_best);); *are_all_covering= intersect->is_covering; - uint best_num= intersect_scans_best - intersect_scans; + uint best_num= (uint) (intersect_scans_best - intersect_scans); ror_intersect_cpy(intersect, intersect_best); /* @@ -3401,7 +3401,7 @@ TRP_ROR_INTERSECT *get_best_covering_ror TRP_ROR_INTERSECT *trp; if (!(trp= new (param->mem_root) TRP_ROR_INTERSECT)) DBUG_RETURN(trp); - uint best_num= (ror_scan_mark - tree->ror_scans); + uint best_num= (uint) (ror_scan_mark - tree->ror_scans); if (!(trp->first_scan= (ROR_SCAN_INFO**)alloc_root(param->mem_root, sizeof(ROR_SCAN_INFO*)* best_num))) @@ -3521,7 +3521,7 @@ static TRP_RANGE *get_key_scans_params(P "ROR scans");); if (key_to_read) { - idx= key_to_read - tree->keys; + idx= (uint) (key_to_read - tree->keys); if ((read_plan= new (param->mem_root) TRP_RANGE(*key_to_read, idx))) { read_plan->records= best_records; @@ -4680,7 +4680,7 @@ tree_and(PARAM *param,SEL_TREE *tree1,SE tree1->type= SEL_TREE::IMPOSSIBLE; DBUG_RETURN(tree1); } - result_keys.set_bit(key1 - tree1->keys); + result_keys.set_bit((uint) (key1 - tree1->keys)); #ifdef EXTRA_DEBUG if (*key1 && param->alloced_sel_args < SEL_ARG::MAX_SEL_ARGS) (*key1)->test_use_count(*key1); @@ -4762,7 +4762,7 @@ tree_or(PARAM *param,SEL_TREE *tree1,SEL if (*key1) { result=tree1; // Added to tree1 - result_keys.set_bit(key1 - tree1->keys); + result_keys.set_bit((uint) (key1 - tree1->keys)); #ifdef EXTRA_DEBUG if (param->alloced_sel_args < SEL_ARG::MAX_SEL_ARGS) (*key1)->test_use_count(*key1); @@ -6876,8 +6876,8 @@ int QUICK_RANGE_SELECT::get_next() } } - uint count= min(multi_range_length, ranges.elements - - (cur_range - (QUICK_RANGE**) ranges.buffer)); + uint count= min(multi_range_length, (uint) (ranges.elements - + (cur_range - (QUICK_RANGE**) ranges.buffer))); if (count == 0) { /* Ranges have already been used up before. None is left for read. */ @@ -6967,7 +6967,7 @@ int QUICK_RANGE_SELECT::get_next_prefix( DBUG_RETURN(result); } - uint count= ranges.elements - (cur_range - (QUICK_RANGE**) ranges.buffer); + uint count= (uint) (ranges.elements - (cur_range - (QUICK_RANGE**) ranges.buffer)); if (count == 0) { /* Ranges have already been used up before. None is left for read. */ @@ -7022,7 +7022,7 @@ int QUICK_RANGE_SELECT_GEOM::get_next() DBUG_RETURN(result); } - uint count= ranges.elements - (cur_range - (QUICK_RANGE**) ranges.buffer); + uint count= (uint) (ranges.elements - (cur_range - (QUICK_RANGE**) ranges.buffer)); if (count == 0) { /* Ranges have already been used up before. None is left for read. */ @@ -7390,18 +7390,18 @@ void QUICK_RANGE_SELECT::add_keys_and_le String *used_lengths) { char buf[64]; - uint length; + size_t length; KEY *key_info= head->key_info + index; key_names->append(key_info->name); length= longlong2str(max_used_key_length, buf, 10) - buf; - used_lengths->append(buf, length); + used_lengths->append(buf, (uint) length); } void QUICK_INDEX_MERGE_SELECT::add_keys_and_lengths(String *key_names, String *used_lengths) { char buf[64]; - uint length; + size_t length; bool first= TRUE; QUICK_RANGE_SELECT *quick; @@ -7419,7 +7419,7 @@ void QUICK_INDEX_MERGE_SELECT::add_keys_ KEY *key_info= head->key_info + quick->index; key_names->append(key_info->name); length= longlong2str(quick->max_used_key_length, buf, 10) - buf; - used_lengths->append(buf, length); + used_lengths->append(buf, (uint) length); } if (pk_quick_select) { @@ -7428,7 +7428,7 @@ void QUICK_INDEX_MERGE_SELECT::add_keys_ key_names->append(key_info->name); length= longlong2str(pk_quick_select->max_used_key_length, buf, 10) - buf; used_lengths->append(','); - used_lengths->append(buf, length); + used_lengths->append(buf, (uint) length); } } @@ -7436,7 +7436,7 @@ void QUICK_ROR_INTERSECT_SELECT::add_key String *used_lengths) { char buf[64]; - uint length; + size_t length; bool first= TRUE; QUICK_RANGE_SELECT *quick; List_iterator_fast<QUICK_RANGE_SELECT> it(quick_selects); @@ -7452,7 +7452,7 @@ void QUICK_ROR_INTERSECT_SELECT::add_key } key_names->append(key_info->name); length= longlong2str(quick->max_used_key_length, buf, 10) - buf; - used_lengths->append(buf, length); + used_lengths->append(buf, (uint) length); } if (cpk_quick) @@ -7462,7 +7462,7 @@ void QUICK_ROR_INTERSECT_SELECT::add_key key_names->append(key_info->name); length= longlong2str(cpk_quick->max_used_key_length, buf, 10) - buf; used_lengths->append(','); - used_lengths->append(buf, length); + used_lengths->append(buf, (uint) length); } } @@ -7965,7 +7965,7 @@ get_best_group_min_max(PARAM *param, SEL } /* If we got to this point, cur_index_info passes the test. */ - key_infix_parts= key_infix_len ? + key_infix_parts= key_infix_len ? (uint) (first_non_infix_part - first_non_group_part) : 0; used_key_parts= cur_group_key_parts + key_infix_parts; @@ -8301,7 +8301,7 @@ get_field_keypart(KEY *index, Field *fie for (part= index->key_part, end= part + index->key_parts; part < end; part++) { if (field->eq(part->field)) - return part - index->key_part + 1; + return (uint) (part - index->key_part + 1); } return 0; } @@ -9556,7 +9556,7 @@ void QUICK_GROUP_MIN_MAX_SELECT::add_key char buf[64]; uint length; key_names->append(index_info->name); - length= longlong2str(max_used_key_length, buf, 10) - buf; + length= (uint) (longlong2str(max_used_key_length, buf, 10) - buf); used_lengths->append(buf, length); } diff -Nrup a/sql/opt_sum.cc b/sql/opt_sum.cc --- a/sql/opt_sum.cc 2007-10-24 04:15:07 -04:00 +++ b/sql/opt_sum.cc 2008-04-09 12:43:36 -04:00 @@ -636,12 +636,12 @@ static bool matching_cond(bool max_fl, T key_part_map org_key_part_used= *key_part_used; if (eq_type || between || max_fl == less_fl) { - uint length= (key_ptr-ref->key_buff)+part->store_length; + size_t length= (key_ptr-ref->key_buff)+part->store_length; if (ref->key_length < length) /* Ultimately ref->key_length will contain the length of the search key */ - ref->key_length= length; + ref->key_length= (uint) length; if (!*prefix_len && part+1 == field_part) - *prefix_len= length; + *prefix_len= (uint) length; if (is_field_part && eq_type) *prefix_len= ref->key_length; diff -Nrup a/sql/parse_file.cc b/sql/parse_file.cc --- a/sql/parse_file.cc 2007-04-06 10:56:37 -04:00 +++ b/sql/parse_file.cc 2008-04-09 12:43:36 -04:00 @@ -226,7 +226,7 @@ sql_create_definition_file(const LEX_STR dir->str, file_name->str, (ulong) base)); fn_format(path, file_name->str, dir->str, 0, MY_UNPACK_FILENAME); - path_end= strlen(path); + path_end= (uint) strlen(path); // temporary file name path[path_end]='~'; @@ -472,7 +472,7 @@ sql_parse_prepare(const LEX_STRING *file sign++; if (*sign != '\n') goto frm_error; - parser->file_type.length= sign - parser->file_type.str; + parser->file_type.length= (uint) (sign - parser->file_type.str); // EOS for file signature just for safety *sign= '\0'; @@ -517,7 +517,7 @@ parse_string(char *ptr, char *end, MEM_R if (eol >= end) return 0; - str->length= eol - ptr; + str->length= (uint) (eol - ptr); if (!(str->str= alloc_root(mem_root, str->length+1))) return 0; @@ -582,7 +582,7 @@ read_escaped_string(char *ptr, char *eol else *write_pos= c; } - str->str[str->length= write_pos-str->str]= '\0'; // just for safety + str->str[str->length= (uint) (write_pos - str->str)]= '\0'; // just for safety return FALSE; } @@ -609,7 +609,7 @@ parse_escaped_string(char *ptr, char *en char *eol= strchr(ptr, '\n'); if (eol == 0 || eol >= end || - !(str->str= alloc_root(mem_root, (eol - ptr) + 1)) || + !(str->str= alloc_root(mem_root, (uint) ((eol - ptr) + 1))) || read_escaped_string(ptr, eol, str)) return 0; diff -Nrup a/sql/protocol.cc b/sql/protocol.cc --- a/sql/protocol.cc 2007-12-01 07:09:13 -05:00 +++ b/sql/protocol.cc 2008-04-09 12:43:36 -04:00 @@ -306,7 +306,7 @@ send_ok(THD *thd, ha_rows affected_rows, pos+=2; } if (message) - pos=net_store_data((char*) pos, message, strlen(message)); + pos=net_store_data((char*) pos, message, (uint) strlen(message)); VOID(my_net_write(net,buff,(uint) (pos-buff))); VOID(net_flush(net)); /* We can't anymore send an error to the client */ @@ -724,8 +724,8 @@ bool Protocol::store(const char *from, C { if (!from) return store_null(); - uint length= strlen(from); - return store(from, length, cs); + size_t length= strlen(from); + return store(from, (uint) length, cs); } diff -Nrup a/sql/set_var.cc b/sql/set_var.cc --- a/sql/set_var.cc 2008-03-28 14:02:23 -04:00 +++ b/sql/set_var.cc 2008-04-09 12:43:36 -04:00 @@ -1912,7 +1912,7 @@ Item *sys_var::item(THD *thd, enum_var_t pthread_mutex_lock(&LOCK_global_system_variables); char *str= (char*) value_ptr(thd, var_type, base); if (str) - tmp= new Item_string(str, strlen(str), + tmp= new Item_string(str, (uint) strlen(str), system_charset_info, DERIVATION_SYSCONST); else { @@ -2057,7 +2057,7 @@ void sys_var_thd_date_time_format::set_d { const char *format; if ((format= opt_date_time_formats[date_time_type])) - res= date_time_format_make(date_time_type, format, strlen(format)); + res= date_time_format_make(date_time_type, format, (uint) strlen(format)); } else { @@ -3144,10 +3144,10 @@ static byte *get_tmpdir(THD *thd) static struct my_option *find_option(struct my_option *opt, const char *name) { - uint length=strlen(name); + size_t length=strlen(name); for (; opt->name; opt++) { - if (!getopt_compare_strings(opt->name, name, length) && + if (!getopt_compare_strings(opt->name, name, (uint) length) && !opt->name[length]) { /* @@ -3188,7 +3188,7 @@ void set_var_init() var < end; var++) { - (*var)->name_length= strlen((*var)->name); + (*var)->name_length= (uint) strlen((*var)->name); (*var)->option_limits= find_option(my_long_options, (*var)->name); my_hash_insert(&system_variable_hash, (byte*) *var); } @@ -3227,7 +3227,7 @@ sys_var *find_sys_var(const char *str, u sys_var *var= (sys_var*) hash_search(&system_variable_hash, (byte*) str, length ? length : - strlen(str)); + (uint) strlen(str)); if (!var) my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), (char*) str); return var; @@ -3456,7 +3456,7 @@ int set_var_password::check(THD *thd) if (*thd->security_ctx->priv_host != 0) { user->host.str= (char *) thd->security_ctx->priv_host; - user->host.length= strlen(thd->security_ctx->priv_host); + user->host.length= (uint) strlen(thd->security_ctx->priv_host); } else { @@ -3466,7 +3466,7 @@ int set_var_password::check(THD *thd) } /* Returns 1 as the function sends error to client */ return check_change_password(thd, user->host.str, user->user.str, - password, strlen(password)) ? 1 : 0; + password, (uint) strlen(password)) ? 1 : 0; #else return 0; #endif diff -Nrup a/sql/slave.cc b/sql/slave.cc --- a/sql/slave.cc 2008-03-28 16:01:01 -04:00 +++ b/sql/slave.cc 2008-04-09 12:43:36 -04:00 @@ -1003,7 +1003,7 @@ int db_ok_with_wild_table(const char *db int len; end= strmov(hash_key, db); *end++= '.'; - len= end - hash_key ; + len= (uint) (end - hash_key); if (wild_do_table_inited && find_wild(&replicate_wild_do_table, hash_key, len)) return 1; @@ -1189,7 +1189,7 @@ void skip_load_data_infile(NET *net) bool net_request_file(NET* net, const char* fname) { DBUG_ENTER("net_request_file"); - DBUG_RETURN(net_write_command(net, 251, fname, strlen(fname), "", 0)); + DBUG_RETURN(net_write_command(net, 251, fname, (uint) strlen(fname), "", 0)); } @@ -1581,7 +1581,7 @@ static int create_table_from_dump(THD* t save_db = thd->db; save_db_length= thd->db_length; DBUG_ASSERT(db != 0); - thd->reset_db((char*)db, strlen(db)); + thd->reset_db((char*)db, (uint) strlen(db)); mysql_parse(thd, thd->query, packet_len, &found_semicolon); // run create table thd->db = save_db; // leave things the way the were before thd->db_length= save_db_length; @@ -2314,11 +2314,11 @@ int register_slave_on_master(MYSQL* mysq if (!report_host) return 0; - report_host_len= strlen(report_host); + report_host_len= (uint) strlen(report_host); if (report_user) - report_user_len= strlen(report_user); + report_user_len= (uint) strlen(report_user); if (report_password) - report_password_len= strlen(report_password); + report_password_len= (uint) strlen(report_password); /* 30 is a good safety margin */ if (report_host_len + report_user_len + report_password_len + 30 > sizeof(buf)) @@ -3043,7 +3043,7 @@ static int request_table_dump(MYSQL* mys *p++ = table_len; memcpy(p, table, table_len); - if (simple_command(mysql, COM_TABLE_DUMP, buf, p - buf + table_len, 1)) + if (simple_command(mysql, COM_TABLE_DUMP, buf, (uint) (p - buf + table_len), 1)) { sql_print_error("request_table_dump: Error sending the table dump \ command"); diff -Nrup a/sql/sp.cc b/sql/sp.cc --- a/sql/sp.cc 2008-02-19 10:27:17 -05:00 +++ b/sql/sp.cc 2008-04-09 12:43:36 -04:00 @@ -413,7 +413,7 @@ db_load_routine(THD *thd, int type, sp_n thd->lex= &newlex; newlex.current_select= NULL; - parse_user(definer, strlen(definer), + parse_user(definer, (uint) strlen(definer), definer_user_name.str, &definer_user_name.length, definer_host_name.str, &definer_host_name.length); @@ -428,9 +428,9 @@ db_load_routine(THD *thd, int type, sp_n if (!create_string(thd, &defstr, type, name, - params, strlen(params), - returns, strlen(returns), - body, strlen(body), + params, (uint) strlen(params), + returns, (uint) strlen(returns), + body, (uint) strlen(body), &chistics, &definer_user_name, &definer_host_name)) { ret= SP_INTERNAL_ERROR; @@ -629,9 +629,9 @@ db_create_routine(THD *thd, int type, sp append_definer(thd, &log_query, &thd->lex->definer->user, &thd->lex->definer->host); log_query.append(thd->lex->stmt_definition_begin, - (char *)sp->m_body_begin - + (uint) ((char *)sp->m_body_begin - thd->lex->stmt_definition_begin + - sp->m_body.length); + sp->m_body.length)); /* Such a statement can always go directly to binlog, no trans cache */ Query_log_event qinfo(thd, log_query.c_ptr(), log_query.length(), 0, @@ -918,7 +918,7 @@ sp_drop_db_routines(THD *thd, char *db) if (!(table= open_proc_table_for_update(thd))) goto err; - table->field[MYSQL_PROC_FIELD_DB]->store(db, strlen(db), system_charset_info); + table->field[MYSQL_PROC_FIELD_DB]->store(db, (uint) strlen(db), system_charset_info); key_len= table->key_info->key_part[0].store_length; ret= SP_OK; @@ -1088,8 +1088,8 @@ sp_exist_routines(THD *thd, TABLE_LIST * sp_name *name; LEX_STRING lex_db; LEX_STRING lex_name; - lex_db.length= strlen(routine->db); - lex_name.length= strlen(routine->table_name); + lex_db.length= (uint) strlen(routine->db); + lex_name.length= (uint) strlen(routine->table_name); lex_db.str= thd->strmake(routine->db, lex_db.length); lex_name.str= thd->strmake(routine->table_name, lex_name.length); name= new sp_name(lex_db, lex_name, true); @@ -1901,7 +1901,7 @@ sp_use_new_db(THD *thd, LEX_STRING new_d if (thd->db) { - old_db->length= (strmake(old_db->str, thd->db, old_db->length - 1) - + old_db->length= (uint) (strmake(old_db->str, thd->db, old_db->length - 1) - old_db->str); } else diff -Nrup a/sql/sp_head.cc b/sql/sp_head.cc --- a/sql/sp_head.cc 2008-01-23 16:04:18 -05:00 +++ b/sql/sp_head.cc 2008-04-09 12:43:36 -04:00 @@ -378,7 +378,7 @@ sp_name::sp_name(THD *thd, char *key, ui m_qname.length= key_len - 1; if ((m_name.str= strchr(m_qname.str, '.'))) { - m_db.length= m_name.str - key; + m_db.length= (uint) (m_name.str - key); m_db.str= strmake_root(thd->mem_root, key, m_db.length); m_name.str++; m_name.length= m_qname.length - m_db.length - 1; @@ -444,7 +444,7 @@ sp_head::operator new(size_t size) throw sp_head *sp; init_sql_alloc(&own_root, MEM_ROOT_BLOCK_SIZE, MEM_ROOT_PREALLOC); - sp= (sp_head *) alloc_root(&own_root, size); + sp= (sp_head *) alloc_root(&own_root, (uint) size); if (sp == NULL) return NULL; sp->main_mem_root= own_root; @@ -591,7 +591,7 @@ sp_head::init_strings(THD *thd, LEX *lex if (m_param_begin && m_param_end) { - m_params.length= m_param_end - m_param_begin; + m_params.length= (uint) (m_param_end - m_param_begin); m_params.str= strmake_root(root, (char *)m_param_begin, m_params.length); } @@ -604,9 +604,9 @@ sp_head::init_strings(THD *thd, LEX *lex */ endp= skip_rear_comments(thd->charset(), (char*) m_body_begin, (char*) endp); - m_body.length= endp - m_body_begin; + m_body.length= (uint) (endp - m_body_begin); m_body.str= strmake_root(root, m_body_begin, m_body.length); - m_defstr.length= endp - lip->buf; + m_defstr.length= (uint) (endp - lip->buf); m_defstr.str= strmake_root(root, lip->buf, m_defstr.length); DBUG_VOID_RETURN; } @@ -3595,7 +3595,7 @@ sp_head::merge_table_list(THD *thd, TABL memcpy(tname+tlen, table->table_name, table->table_name_length); tlen+= table->table_name_length; tname[tlen++]= '\0'; - alen= strlen(table->alias); + alen= (uint) strlen(table->alias); memcpy(tname+tlen, table->alias, alen); tlen+= alen; tname[tlen]= '\0'; @@ -3760,9 +3760,9 @@ sp_add_to_query_tables(THD *thd, LEX *le thd->fatal_error(); return NULL; } - table->db_length= strlen(db); + table->db_length= (uint) strlen(db); table->db= thd->strmake(db, table->db_length); - table->table_name_length= strlen(name); + table->table_name_length= (uint) strlen(name); table->table_name= thd->strmake(name, table->table_name_length); table->alias= thd->strdup(name); table->lock_type= locktype; diff -Nrup a/sql/spatial.cc b/sql/spatial.cc --- a/sql/spatial.cc 2007-07-05 11:24:47 -04:00 +++ b/sql/spatial.cc 2008-04-09 12:43:36 -04:00 @@ -54,7 +54,7 @@ static Geometry::Class_info **ci_collect Geometry::Class_info::Class_info(const char *name, int type_id, void(*create_func)(void *)): - m_name(name, strlen(name)), m_type_id(type_id), m_create_func(create_func) + m_name(name, (uint) strlen(name)), m_type_id(type_id), m_create_func(create_func) { ci_collection[type_id]= this; } diff -Nrup a/sql/sql_acl.cc b/sql/sql_acl.cc --- a/sql/sql_acl.cc 2008-03-28 05:26:39 -04:00 +++ b/sql/sql_acl.cc 2008-04-09 12:43:36 -04:00 @@ -312,8 +312,8 @@ static my_bool acl_load(THD *thd, TABLE_ } const char *password= get_field(thd->mem_root, table->field[2]); - uint password_len= password ? strlen(password) : 0; - set_user_salt(&user, password, password_len); + size_t password_len= password ? strlen(password) : 0; + set_user_salt(&user, password, (uint) password_len); if (user.salt_len == 0 && password_len != 0) { switch (password_len) { @@ -1404,7 +1404,7 @@ int check_change_password(THD *thd, cons MYF(0)); return(1); } - uint len=strlen(new_password); + size_t len= strlen(new_password); if (len && len != SCRAMBLED_PASSWORD_CHAR_LENGTH && len != SCRAMBLED_PASSWORD_CHAR_LENGTH_323) { @@ -1438,14 +1438,14 @@ bool change_password(THD *thd, const cha /* Buffer should be extended when password length is extended. */ char buff[512]; ulong query_length; - uint new_password_len= strlen(new_password); + size_t new_password_len= strlen(new_password); bool result= 1; DBUG_ENTER("change_password"); DBUG_PRINT("enter",("host: '%s' user: '%s' new_password: '%s'", host,user,new_password)); DBUG_ASSERT(host != 0); // Ensured by parent - if (check_change_password(thd, host, user, new_password, new_password_len)) + if (check_change_password(thd, host, user, new_password, (uint) new_password_len)) DBUG_RETURN(1); bzero((char*) &tables, sizeof(tables)); @@ -1482,12 +1482,12 @@ bool change_password(THD *thd, const cha goto end; } /* update loaded acl entry: */ - set_user_salt(acl_user, new_password, new_password_len); + set_user_salt(acl_user, new_password, (uint) new_password_len); if (update_user_table(thd, table, acl_user->host.hostname ? acl_user->host.hostname : "", acl_user->user ? acl_user->user : "", - new_password, new_password_len)) + new_password, (uint) new_password_len)) { VOID(pthread_mutex_unlock(&acl_cache->lock)); /* purecov: deadcode */ goto end; @@ -1640,11 +1640,11 @@ bool hostname_requires_resolving(const c char cur; if (!hostname) return FALSE; - int namelen= strlen(hostname); - int lhlen= strlen(my_localhost); + size_t namelen= strlen(hostname); + size_t lhlen= strlen(my_localhost); if ((namelen == lhlen) && - !my_strnncoll(system_charset_info, (const uchar *)hostname, namelen, - (const uchar *)my_localhost, strlen(my_localhost))) + !my_strnncoll(system_charset_info, (const uchar *)hostname, (uint) namelen, + (const uchar *)my_localhost, (uint) strlen(my_localhost))) return FALSE; for (; (cur=*hostname); hostname++) { @@ -1872,13 +1872,13 @@ static int replace_user_table(THD *thd, table->field[next_field+3]->store("", 0, &my_charset_latin1); if (lex->ssl_cipher) table->field[next_field+1]->store(lex->ssl_cipher, - strlen(lex->ssl_cipher), system_charset_info); + (uint) strlen(lex->ssl_cipher), system_charset_info); if (lex->x509_issuer) table->field[next_field+2]->store(lex->x509_issuer, - strlen(lex->x509_issuer), system_charset_info); + (uint) strlen(lex->x509_issuer), system_charset_info); if (lex->x509_subject) table->field[next_field+3]->store(lex->x509_subject, - strlen(lex->x509_subject), system_charset_info); + (uint) strlen(lex->x509_subject), system_charset_info); break; case SSL_TYPE_NOT_SPECIFIED: break; @@ -4185,10 +4185,10 @@ static void add_user_option(String *gran { char buff[22], *p; // just as in int2str grant->append(' '); - grant->append(name, strlen(name)); + grant->append(name, (uint) strlen(name)); grant->append(' '); p=int10_to_str(value, buff, 10); - grant->append(buff,p-buff); + grant->append(buff,(uint) (p - buff)); } } @@ -4326,7 +4326,7 @@ bool mysql_show_grants(THD *thd,LEX_USER { ssl_options++; global.append(STRING_WITH_LEN("ISSUER \'")); - global.append(acl_user->x509_issuer,strlen(acl_user->x509_issuer)); + global.append(acl_user->x509_issuer,(uint) strlen(acl_user->x509_issuer)); global.append('\''); } if (acl_user->x509_subject) @@ -4334,7 +4334,7 @@ bool mysql_show_grants(THD *thd,LEX_USER if (ssl_options++) global.append(' '); global.append(STRING_WITH_LEN("SUBJECT \'")); - global.append(acl_user->x509_subject,strlen(acl_user->x509_subject), + global.append(acl_user->x509_subject,(uint) strlen(acl_user->x509_subject), system_charset_info); global.append('\''); } @@ -4343,7 +4343,7 @@ bool mysql_show_grants(THD *thd,LEX_USER if (ssl_options++) global.append(' '); global.append(STRING_WITH_LEN("CIPHER '")); - global.append(acl_user->ssl_cipher,strlen(acl_user->ssl_cipher), + global.append(acl_user->ssl_cipher,(uint) strlen(acl_user->ssl_cipher), system_charset_info); global.append('\''); } @@ -4423,13 +4423,13 @@ bool mysql_show_grants(THD *thd,LEX_USER } } db.append (STRING_WITH_LEN(" ON ")); - append_identifier(thd, &db, acl_db->db, strlen(acl_db->db)); + append_identifier(thd, &db, acl_db->db, (uint) strlen(acl_db->db)); db.append (STRING_WITH_LEN(".* TO '")); db.append(lex_user->user.str, lex_user->user.length, system_charset_info); db.append (STRING_WITH_LEN("'@'")); // host and lex_user->host are equal except for case - db.append(host, strlen(host), system_charset_info); + db.append(host, (uint) strlen(host), system_charset_info); db.append ('\''); if (want_access & GRANT_ACL) db.append(STRING_WITH_LEN(" WITH GRANT OPTION")); @@ -4535,16 +4535,16 @@ bool mysql_show_grants(THD *thd,LEX_USER } global.append(STRING_WITH_LEN(" ON ")); append_identifier(thd, &global, grant_table->db, - strlen(grant_table->db)); + (uint) strlen(grant_table->db)); global.append('.'); append_identifier(thd, &global, grant_table->tname, - strlen(grant_table->tname)); + (uint) strlen(grant_table->tname)); global.append(STRING_WITH_LEN(" TO '")); global.append(lex_user->user.str, lex_user->user.length, system_charset_info); global.append(STRING_WITH_LEN("'@'")); // host and lex_user->host are equal except for case - global.append(host, strlen(host), system_charset_info); + global.append(host, (uint) strlen(host), system_charset_info); global.append('\''); if (table_access & GRANT_ACL) global.append(STRING_WITH_LEN(" WITH GRANT OPTION")); @@ -4641,16 +4641,16 @@ static int show_routine_grants(THD* thd, global.append(type,typelen); global.append(' '); append_identifier(thd, &global, grant_proc->db, - strlen(grant_proc->db)); + (uint) strlen(grant_proc->db)); global.append('.'); append_identifier(thd, &global, grant_proc->tname, - strlen(grant_proc->tname)); + (uint) strlen(grant_proc->tname)); global.append(STRING_WITH_LEN(" TO '")); global.append(lex_user->user.str, lex_user->user.length, system_charset_info); global.append(STRING_WITH_LEN("'@'")); // host and lex_user->host are equal except for case - global.append(host, strlen(host), system_charset_info); + global.append(host, (uint) strlen(host), system_charset_info); global.append('\''); if (proc_access & GRANT_ACL) global.append(STRING_WITH_LEN(" WITH GRANT OPTION")); @@ -5769,11 +5769,11 @@ bool sp_revoke_privileges(THD *thd, cons { LEX_USER lex_user; lex_user.user.str= grant_proc->user; - lex_user.user.length= strlen(grant_proc->user); + lex_user.user.length= (uint) strlen(grant_proc->user); lex_user.host.str= grant_proc->host.hostname ? grant_proc->host.hostname : (char*)""; lex_user.host.length= grant_proc->host.hostname ? - strlen(grant_proc->host.hostname) : 0; + (uint) strlen(grant_proc->host.hostname) : 0; if (!replace_routine_table(thd,grant_proc,tables[4].table,lex_user, grant_proc->db, grant_proc->tname, is_proc, ~(ulong)0, 1)) @@ -5852,8 +5852,8 @@ int sp_grant_privileges(THD *thd, const tables->db= (char*)sp_db; tables->table_name= tables->alias= (char*)sp_name; - combo->host.length= strlen(combo->host.str); - combo->user.length= strlen(combo->user.str); + combo->host.length= (uint) strlen(combo->host.str); + combo->user.length= (uint) strlen(combo->user.str); combo->host.str= thd->strmake(combo->host.str,combo->host.length); combo->user.str= thd->strmake(combo->user.str,combo->user.length); @@ -5961,15 +5961,15 @@ void update_schema_privilege(TABLE *tabl int i= 2; CHARSET_INFO *cs= system_charset_info; restore_record(table, s->default_values); - table->field[0]->store(buff, strlen(buff), cs); + table->field[0]->store(buff, (uint) strlen(buff), cs); if (db) - table->field[i++]->store(db, strlen(db), cs); + table->field[i++]->store(db, (uint) strlen(db), cs); if (t_name) - table->field[i++]->store(t_name, strlen(t_name), cs); + table->field[i++]->store(t_name, (uint) strlen(t_name), cs); if (column) table->field[i++]->store(column, col_length, cs); table->field[i++]->store(priv, priv_length, cs); - table->field[i]->store(is_grantable, strlen(is_grantable), cs); + table->field[i]->store(is_grantable, (uint) strlen(is_grantable), cs); table->file->write_row(table->record[0]); } diff -Nrup a/sql/sql_base.cc b/sql/sql_base.cc --- a/sql/sql_base.cc 2008-03-21 11:23:14 -04:00 +++ b/sql/sql_base.cc 2008-04-09 12:43:36 -04:00 @@ -780,10 +780,10 @@ void close_temporary_tables(THD *thd) We are going to add 4 ` around the db/table names and possible more due to special characters in the names */ - append_identifier(thd, &s_query, table->s->db, strlen(table->s->db)); + append_identifier(thd, &s_query, table->s->db, (uint) strlen(table->s->db)); s_query.q_append('.'); append_identifier(thd, &s_query, table->s->table_name, - strlen(table->s->table_name)); + (uint) strlen(table->s->table_name)); s_query.q_append(','); next= table->next; close_temporary(table, 1); @@ -3674,7 +3674,7 @@ find_field_in_table(THD *thd, TABLE *tab if (field_ptr && *field_ptr) { - *cached_field_index_ptr= field_ptr - table->field; + *cached_field_index_ptr= (uint) (field_ptr - table->field); field= *field_ptr; } else @@ -5963,7 +5963,7 @@ my_bool mysql_rm_tmp_tables(void) if (!bcmp(file->name,tmp_file_prefix,tmp_file_prefix_length)) { char *ext= fn_ext(file->name); - uint ext_len= strlen(ext); + size_t ext_len= strlen(ext); uint filePath_len= my_snprintf(filePath, sizeof(filePath), "%s%s", tmpdir, file->name); if (!bcmp(reg_ext, ext, ext_len)) @@ -6235,7 +6235,7 @@ open_new_frm(THD *thd, const char *path, DBUG_ENTER("open_new_frm"); pathstr.str= (char*) path; - pathstr.length= strlen(path); + pathstr.length= (uint) strlen(path); if ((parser= sql_parse_prepare(&pathstr, mem_root, 1))) { diff -Nrup a/sql/sql_cache.cc b/sql/sql_cache.cc --- a/sql/sql_cache.cc 2008-03-28 14:02:23 -04:00 +++ b/sql/sql_cache.cc 2008-04-09 12:43:36 -04:00 @@ -3112,7 +3112,7 @@ Query_cache::process_and_count_tables(TH { ha_myisammrg *handler = (ha_myisammrg *)tables_used->table->file; MYRG_INFO *file = handler->myrg_info(); - table_count+= (file->end_table - file->open_tables); + table_count+= (uint) (file->end_table - file->open_tables); } } } @@ -3299,7 +3299,7 @@ my_bool Query_cache::move_by_type(byte * *pprev = block->pprev, *pnext = block->pnext, *new_block =(Query_cache_block *) *border; - uint tablename_offset = block->table()->table() - block->table()->db(); + size_t tablename_offset= block->table()->table() - block->table()->db(); char *data = (char*) block->data(); byte *key; uint key_length; @@ -3611,7 +3611,7 @@ uint Query_cache::filename_2_table_key ( filename= tablename + dirname_length(tablename + 2) + 2; /* Find start of databasename */ for (dbname= filename - 2 ; dbname[-1] != FN_LIBCHAR ; dbname--) ; - *db_length= (filename - dbname) - 1; + *db_length= (uint) ((filename - dbname) - 1); DBUG_PRINT("qcache", ("table '%-.*s.%s'", *db_length, dbname, filename)); DBUG_RETURN((uint) (strmov(strmake(key, dbname, *db_length) + 1, @@ -3920,8 +3920,8 @@ my_bool Query_cache::check_integrity(boo } else { - int idx = (((byte*)bin) - ((byte*)bins)) / - sizeof(Query_cache_memory_bin); + int idx = (int) ((((byte*)bin) - ((byte*)bins)) / + sizeof(Query_cache_memory_bin)); if (in_list(bins[idx].free_blocks, block, "free memory")) result = 1; } diff -Nrup a/sql/sql_crypt.cc b/sql/sql_crypt.cc --- a/sql/sql_crypt.cc 2006-12-30 15:02:07 -05:00 +++ b/sql/sql_crypt.cc 2008-04-09 12:43:36 -04:00 @@ -31,7 +31,7 @@ SQL_CRYPT::SQL_CRYPT(const char *password) { ulong rand_nr[2]; - hash_password(rand_nr,password, strlen(password)); + hash_password(rand_nr,password, (uint) strlen(password)); crypt_init(rand_nr); } diff -Nrup a/sql/sql_db.cc b/sql/sql_db.cc --- a/sql/sql_db.cc 2008-03-21 11:23:14 -04:00 +++ b/sql/sql_db.cc 2008-04-09 12:43:36 -04:00 @@ -239,7 +239,7 @@ void del_dbopt(const char *path) my_dbopt_t *opt; rw_wrlock(&LOCK_dboptions); if ((opt= (my_dbopt_t *)hash_search(&dboptions, (const byte*) path, - strlen(path)))) + (uint) strlen(path)))) hash_delete(&dboptions, (byte*) opt); rw_unlock(&LOCK_dboptions); } @@ -582,7 +582,7 @@ int mysql_create_db(THD *thd, char *db, # database does not exist. */ qinfo.db = db; - qinfo.db_len = strlen(db); + qinfo.db_len = (uint) strlen(db); /* These DDL methods and logging protected with LOCK_mysql_create_db */ mysql_bin_log.write(&qinfo); @@ -653,7 +653,7 @@ bool mysql_alter_db(THD *thd, const char default. */ qinfo.db = db; - qinfo.db_len = strlen(db); + qinfo.db_len = (uint) strlen(db); thd->clear_error(); /* These DDL methods and logging protected with LOCK_mysql_create_db */ @@ -777,7 +777,7 @@ bool mysql_rm_db(THD *thd,char *db,bool default. */ qinfo.db = db; - qinfo.db_len = strlen(db); + qinfo.db_len = (uint) strlen(db); thd->clear_error(); /* These DDL methods and logging protected with LOCK_mysql_create_db */ @@ -797,18 +797,18 @@ bool mysql_rm_db(THD *thd,char *db,bool goto exit; /* not much else we can do */ query_pos= query_data_start= strmov(query,"drop table "); query_end= query + MAX_DROP_TABLE_Q_LEN; - db_len= strlen(db); + db_len= (uint) strlen(db); for (tbl= dropped_tables; tbl; tbl= tbl->next_local) { uint tbl_name_len; /* 3 for the quotes and the comma*/ - tbl_name_len= strlen(tbl->table_name) + 3; + tbl_name_len= (uint) strlen(tbl->table_name) + 3; if (query_pos + tbl_name_len + 1 >= query_end) { /* These DDL methods and logging protected with LOCK_mysql_create_db */ - write_to_binlog(thd, query, query_pos -1 - query, db, db_len); + write_to_binlog(thd, query, (uint) (query_pos - 1 - query), db, db_len); query_pos= query_data_start; } @@ -821,7 +821,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if (query_pos != query_data_start) { /* These DDL methods and logging protected with LOCK_mysql_create_db */ - write_to_binlog(thd, query, query_pos -1 - query, db, db_len); + write_to_binlog(thd, query, (uint) (query_pos - 1 - query), db, db_len); } } @@ -935,7 +935,7 @@ static long mysql_rm_known_files(THD *th /* Drop the table nicely */ *extension= 0; // Remove extension TABLE_LIST *table_list=(TABLE_LIST*) - thd->calloc(sizeof(*table_list)+ strlen(db)+strlen(file->name)+2); + thd->calloc((uint) (sizeof(*table_list)+ strlen(db)+strlen(file->name)+2)); if (!table_list) goto err; table_list->db= (char*) (table_list+1); diff -Nrup a/sql/sql_derived.cc b/sql/sql_derived.cc --- a/sql/sql_derived.cc 2007-03-22 10:07:30 -04:00 +++ b/sql/sql_derived.cc 2008-04-09 12:43:36 -04:00 @@ -177,7 +177,7 @@ exit: orig_table_list->derived_result= derived_result; orig_table_list->table= table; orig_table_list->table_name= (char*) table->s->table_name; - orig_table_list->table_name_length= strlen((char*)table->s->table_name); + orig_table_list->table_name_length= (uint) strlen((char*)table->s->table_name); table->derived_select_number= first_select->select_number; table->s->tmp_table= NON_TRANSACTIONAL_TMP_TABLE; #ifndef NO_EMBEDDED_ACCESS_CHECKS diff -Nrup a/sql/sql_error.cc b/sql/sql_error.cc --- a/sql/sql_error.cc 2007-06-20 04:46:11 -04:00 +++ b/sql/sql_error.cc 2008-04-09 12:43:36 -04:00 @@ -243,7 +243,7 @@ bool mysqld_show_warnings(THD *thd, ulon protocol->store(warning_level_names[err->level], warning_level_length[err->level], system_charset_info); protocol->store((uint32) err->code); - protocol->store(err->msg, strlen(err->msg), system_charset_info); + protocol->store(err->msg, (uint) strlen(err->msg), system_charset_info); if (protocol->write()) DBUG_RETURN(TRUE); } diff -Nrup a/sql/sql_handler.cc b/sql/sql_handler.cc --- a/sql/sql_handler.cc 2007-10-12 09:55:44 -04:00 +++ b/sql/sql_handler.cc 2008-04-09 12:43:36 -04:00 @@ -90,7 +90,7 @@ static int mysql_ha_flush_table(THD *thd static char *mysql_ha_hash_get_key(TABLE_LIST *tables, uint *key_len_p, my_bool first __attribute__((unused))) { - *key_len_p= strlen(tables->alias) + 1 ; /* include '\0' in comparisons */ + *key_len_p= (uint) strlen(tables->alias) + 1 ; /* include '\0' in comparisons */ return tables->alias; } @@ -202,7 +202,7 @@ bool mysql_ha_open(THD *thd, TABLE_LIST else if (! reopen) /* Otherwise we have 'tables' already. */ { if (hash_search(&thd->handler_tables_hash, (byte*) tables->alias, - strlen(tables->alias) + 1)) + (uint) strlen(tables->alias) + 1)) { DBUG_PRINT("info",("duplicate '%s'", tables->alias)); if (! reopen) @@ -259,9 +259,9 @@ bool mysql_ha_open(THD *thd, TABLE_LIST if (! reopen) { /* copy the TABLE_LIST struct */ - dblen= strlen(tables->db) + 1; - namelen= strlen(tables->table_name) + 1; - aliaslen= strlen(tables->alias) + 1; + dblen= (uint) strlen(tables->db) + 1; + namelen= (uint) strlen(tables->table_name) + 1; + aliaslen= (uint) strlen(tables->alias) + 1; if (!(my_multi_malloc(MYF(MY_WME), &hash_tables, sizeof(*hash_tables), &db, dblen, @@ -324,7 +324,7 @@ bool mysql_ha_close(THD *thd, TABLE_LIST if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash, (byte*) tables->alias, - strlen(tables->alias) + 1))) + (uint) strlen(tables->alias) + 1))) { mysql_ha_close_table(thd, hash_tables); hash_delete(&thd->handler_tables_hash, (byte*) hash_tables); @@ -396,7 +396,7 @@ bool mysql_ha_read(THD *thd, TABLE_LIST retry: if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash, (byte*) tables->alias, - strlen(tables->alias) + 1))) + (uint) strlen(tables->alias) + 1))) { table= hash_tables->table; DBUG_PRINT("info-in-hash",("'%s'.'%s' as '%s' tab %p", @@ -779,7 +779,7 @@ static int mysql_ha_flush_table(THD *thd if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash, (byte*) table->alias, - strlen(table->alias) + 1))) + (uint) strlen(table->alias) + 1))) { if (! (mode_flags & MYSQL_HA_REOPEN_ON_USAGE)) { diff -Nrup a/sql/sql_help.cc b/sql/sql_help.cc --- a/sql/sql_help.cc 2007-10-17 12:08:53 -04:00 +++ b/sql/sql_help.cc 2008-04-09 12:43:36 -04:00 @@ -628,7 +628,7 @@ bool mysqld_help(THD *thd, const char *m List<String> topics_list, categories_list, subcategories_list; String name, description, example; int count_topics, count_categories, error; - uint mlen= strlen(mask); + size_t mlen= strlen(mask); size_t i; MEM_ROOT *mem_root= thd->mem_root; DBUG_ENTER("mysqld_help"); @@ -668,7 +668,7 @@ bool mysqld_help(THD *thd, const char *m tables[i].table->file->init_table_handle_for_HANDLER(); if (!(select= - prepare_select_for_name(thd,mask,mlen,tables,tables[0].table, + prepare_select_for_name(thd,mask,(uint) mlen,tables,tables[0].table, used_fields[help_topic_name].field,&error))) goto error; @@ -681,7 +681,7 @@ bool mysqld_help(THD *thd, const char *m { int key_id; if (!(select= - prepare_select_for_name(thd,mask,mlen,tables,tables[3].table, + prepare_select_for_name(thd,mask,(uint) mlen,tables,tables[3].table, used_fields[help_keyword_name].field,&error))) goto error; @@ -698,7 +698,7 @@ bool mysqld_help(THD *thd, const char *m int16 category_id; Field *cat_cat_id= used_fields[help_category_parent_category_id].field; if (!(select= - prepare_select_for_name(thd,mask,mlen,tables,tables[1].table, + prepare_select_for_name(thd,mask,(uint) mlen,tables,tables[1].table, used_fields[help_category_name].field,&error))) goto error; @@ -759,7 +759,7 @@ bool mysqld_help(THD *thd, const char *m send_variant_2_list(mem_root,protocol, &topics_list, "N", 0)) goto error; if (!(select= - prepare_select_for_name(thd,mask,mlen,tables,tables[1].table, + prepare_select_for_name(thd,mask,(uint) mlen,tables,tables[1].table, used_fields[help_category_name].field,&error))) goto error; search_categories(thd, tables[1].table, used_fields, diff -Nrup a/sql/sql_insert.cc b/sql/sql_insert.cc --- a/sql/sql_insert.cc 2008-03-28 09:34:05 -04:00 +++ b/sql/sql_insert.cc 2008-04-09 12:43:36 -04:00 @@ -1819,7 +1819,7 @@ bool delayed_get_table(THD *thd, TABLE_L pthread_mutex_lock(&LOCK_thread_count); thread_count++; pthread_mutex_unlock(&LOCK_thread_count); - di->thd.set_db(table_list->db, strlen(table_list->db)); + di->thd.set_db(table_list->db, (uint) strlen(table_list->db)); di->thd.query= my_strdup(table_list->table_name, MYF(MY_WME)); if (di->thd.db == NULL || di->thd.query == NULL) { diff -Nrup a/sql/sql_lex.cc b/sql/sql_lex.cc --- a/sql/sql_lex.cc 2008-03-27 12:49:16 -04:00 +++ b/sql/sql_lex.cc 2008-04-09 12:43:36 -04:00 @@ -854,7 +854,7 @@ int MYSQLlex(void *arg, void *yythd) case MY_LEX_HEX_NUMBER: // Found x'hexstring' yyGet(); // Skip ' while (my_isxdigit(cs,(c = yyGet()))) ; - length=(lip->ptr - lip->tok_start); // Length of hexnum+3 + length=(uint) (lip->ptr - lip->tok_start); // Length of hexnum+3 if (!(length & 1) || c != '\'') { return(ABORT_SYM); // Illegal hex constant @@ -868,7 +868,7 @@ int MYSQLlex(void *arg, void *yythd) case MY_LEX_BIN_NUMBER: // Found b'bin-string' yyGet(); // Skip ' while ((c= yyGet()) == '0' || c == '1'); - length= (lip->ptr - lip->tok_start); // Length of bin-num + 3 + length= (uint) (lip->ptr - lip->tok_start); // Length of bin-num + 3 if (c != '\'') return(ABORT_SYM); // Illegal hex constant yyGet(); // get_token makes an unget diff -Nrup a/sql/sql_load.cc b/sql/sql_load.cc --- a/sql/sql_load.cc 2008-03-28 11:59:13 -04:00 +++ b/sql/sql_load.cc 2008-04-09 12:43:36 -04:00 @@ -524,8 +524,8 @@ static bool write_execute_load_query_log { Execute_load_query_log_event e(thd, thd->query, thd->query_length, - (char*)thd->lex->fname_start - (char*)thd->query, - (char*)thd->lex->fname_end - (char*)thd->query, + (uint) ((char*)thd->lex->fname_start - (char*)thd->query), + (uint) ((char*)thd->lex->fname_end - (char*)thd->query), (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE : (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR), transactional_table, FALSE, killed_err_arg); diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc --- a/sql/sql_parse.cc 2008-03-21 11:23:14 -04:00 +++ b/sql/sql_parse.cc 2008-04-09 12:43:36 -04:00 @@ -203,7 +203,7 @@ static int get_or_create_user_conn(THD * USER_RESOURCES *mqh) { int return_val= 0; - uint temp_len, user_len; + size_t temp_len, user_len; char temp_user[USER_HOST_BUFF_SIZE]; struct user_conn *uc; @@ -214,7 +214,7 @@ static int get_or_create_user_conn(THD * temp_len= (strmov(strmov(temp_user, user)+1, host) - temp_user)+1; (void) pthread_mutex_lock(&LOCK_user_conn); if (!(uc = (struct user_conn *) hash_search(&hash_user_connections, - (byte*) temp_user, temp_len))) + (byte*) temp_user, (uint) temp_len))) { /* First connection for user; Create a user connection object */ if (!(uc= ((struct user_conn*) @@ -228,7 +228,7 @@ static int get_or_create_user_conn(THD * uc->user=(char*) (uc+1); memcpy(uc->user,temp_user,temp_len+1); uc->host= uc->user + user_len + 1; - uc->len= temp_len; + uc->len= (uint) temp_len; uc->connections= uc->questions= uc->updates= uc->conn_per_hour= 0; uc->user_resources= *mqh; uc->intime= thd->thr_create_time; @@ -281,7 +281,7 @@ int check_user(THD *thd, enum enum_serve bool check_count) { DBUG_ENTER("check_user"); - LEX_STRING db_str= { (char *) db, db ? strlen(db) : 0 }; + LEX_STRING db_str= { (char *) db, db ? (uint) strlen(db) : 0 }; #ifdef NO_EMBEDDED_ACCESS_CHECKS thd->main_security_ctx.master_access= GLOBAL_ACLS; // Full rights @@ -989,7 +989,7 @@ static int check_connection(THD *thd) char *user= end; char *passwd= strend(user)+1; - uint user_len= passwd - user - 1; + size_t user_len= passwd - user - 1; char *db= passwd; char db_buff[NAME_LEN + 1]; // buffer to store db in utf8 char user_buff[USERNAME_LENGTH + 1]; // buffer to store user in utf8 @@ -1004,10 +1004,10 @@ static int check_connection(THD *thd) *passwd > 127 and become 2**32-127 after casting to uint. */ uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ? - (uchar)(*passwd++) : strlen(passwd); + (uchar)(*passwd++) : (uint) strlen(passwd); db= thd->client_capabilities & CLIENT_CONNECT_WITH_DB ? db + passwd_len + 1 : 0; - uint db_len= db ? strlen(db) : 0; + size_t db_len= db ? strlen(db) : 0; if (passwd + passwd_len + db_len > (char *)net->read_pos + pkt_len) { @@ -1020,13 +1020,13 @@ static int check_connection(THD *thd) { db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1, system_charset_info, - db, db_len, + db, (uint) db_len, thd->charset(), &dummy_errors)]= 0; db= db_buff; } user_buff[user_len= copy_and_convert(user_buff, sizeof(user_buff)-1, - system_charset_info, user, user_len, + system_charset_info, user, (uint) user_len, thd->charset(), &dummy_errors)]= '\0'; user= user_buff; @@ -1706,7 +1706,7 @@ bool dispatch_command(enum enum_server_c statistic_increment(thd->status_var.com_stat[SQLCOM_CHANGE_DB], &LOCK_status); thd->convert_string(&tmp, system_charset_info, - packet, strlen(packet), thd->charset()); + packet, (uint) strlen(packet), thd->charset()); if (!mysql_change_db(thd, &tmp, FALSE)) { mysql_log.write(thd,command,"%s",thd->db); @@ -1769,7 +1769,7 @@ bool dispatch_command(enum enum_server_c */ char db_buff[NAME_LEN+1]; // buffer to store db in utf8 char *db= passwd; - uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ? + size_t passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ? (uchar)(*passwd++) : strlen(passwd); db+= passwd_len + 1; #ifndef EMBEDDED_LIBRARY @@ -1783,7 +1783,7 @@ bool dispatch_command(enum enum_server_c /* Convert database name to utf8 */ uint dummy_errors; db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1, - system_charset_info, db, strlen(db), + system_charset_info, db, (uint) strlen(db), thd->charset(), &dummy_errors)]= 0; db= db_buff; @@ -1802,7 +1802,7 @@ bool dispatch_command(enum enum_server_c /* Clear variables that are allocated */ thd->user_connect= 0; - int res= check_user(thd, COM_CHANGE_USER, passwd, passwd_len, db, FALSE); + int res= check_user(thd, COM_CHANGE_USER, passwd, (uint) passwd_len, db, FALSE); if (res) { @@ -1943,7 +1943,7 @@ bool dispatch_command(enum enum_server_c table_list.schema_table= schema_table; } - thd->query_length= strlen(packet); // for simplicity: don't optimize + thd->query_length= (uint) strlen(packet); // for simplicity: don't optimize if (!(thd->query=fields=thd->memdup(packet,thd->query_length+1))) break; mysql_log.write(thd,command,"%s %s",table_list.table_name, fields); @@ -3848,7 +3848,7 @@ end_with_restore_list: #endif case SQLCOM_CHANGE_DB: { - LEX_STRING db_str= { (char *) select_lex->db, strlen(select_lex->db) }; + LEX_STRING db_str= { (char *) select_lex->db, (uint) strlen(select_lex->db) }; if (!mysql_change_db(thd, &db_str, FALSE)) send_ok(thd); @@ -6061,7 +6061,7 @@ void create_select_for_variable(const ch mysql_init_select(lex); lex->sql_command= SQLCOM_SELECT; tmp.str= (char*) var_name; - tmp.length=strlen(var_name); + tmp.length=(uint) strlen(var_name); bzero((char*) &null_lex_string.str, sizeof(null_lex_string)); /* We set the name of Item to @@session.var_name because that then is used @@ -6070,7 +6070,7 @@ void create_select_for_variable(const ch if ((var= get_system_var(thd, OPT_SESSION, tmp, null_lex_string))) { end= strxmov(buff, "@@session.", var_name, NullS); - var->set_name(buff, end-buff, system_charset_info); + var->set_name(buff, (uint) (end - buff), system_charset_info); add_item_to_list(thd, var); } DBUG_VOID_RETURN; @@ -7787,10 +7787,10 @@ void get_default_definer(THD *thd, LEX_U const Security_context *sctx= thd->security_ctx; definer->user.str= (char *) sctx->priv_user; - definer->user.length= strlen(definer->user.str); + definer->user.length= (uint) strlen(definer->user.str); definer->host.str= (char *) sctx->priv_host; - definer->host.length= strlen(definer->host.str); + definer->host.length= (uint) strlen(definer->host.str); } @@ -7917,7 +7917,7 @@ bool check_string_length(LEX_STRING *str static bool test_if_data_home_dir(const char *dir) { char path[FN_REFLEN], conv_path[FN_REFLEN]; - uint dir_len, home_dir_len= strlen(mysql_unpacked_real_data_home); + uint dir_len, home_dir_len= (uint) strlen(mysql_unpacked_real_data_home); DBUG_ENTER("test_if_data_home_dir"); if (!dir) diff -Nrup a/sql/sql_prepare.cc b/sql/sql_prepare.cc --- a/sql/sql_prepare.cc 2008-03-27 07:52:54 -04:00 +++ b/sql/sql_prepare.cc 2008-04-09 12:43:36 -04:00 @@ -726,13 +726,13 @@ static bool insert_params_withlog(Prepar Item_param *param= *it; if (param->state != Item_param::LONG_DATA_VALUE) { - if (is_param_null(null_array, it - begin)) + if (is_param_null(null_array, (uint) (it - begin))) param->set_null(); else { if (read_pos >= data_end) DBUG_RETURN(1); - param->set_param_func(param, &read_pos, data_end - read_pos); + param->set_param_func(param, &read_pos, (uint) (data_end - read_pos)); if (param->state == Item_param::NO_VALUE) DBUG_RETURN(1); } @@ -764,13 +764,13 @@ static bool insert_params(Prepared_state Item_param *param= *it; if (param->state != Item_param::LONG_DATA_VALUE) { - if (is_param_null(null_array, it - begin)) + if (is_param_null(null_array, (uint) (it - begin))) param->set_null(); else { if (read_pos >= data_end) DBUG_RETURN(1); - param->set_param_func(param, &read_pos, data_end - read_pos); + param->set_param_func(param, &read_pos, (uint) (data_end - read_pos)); if (param->state == Item_param::NO_VALUE) DBUG_RETURN(1); } diff -Nrup a/sql/sql_repl.cc b/sql/sql_repl.cc --- a/sql/sql_repl.cc 2008-01-31 01:19:20 -05:00 +++ b/sql/sql_repl.cc 2008-04-09 12:43:36 -04:00 @@ -202,7 +202,7 @@ void adjust_linfo_offsets(my_off_t purge bool log_in_use(const char* log_name) { - int log_name_len = strlen(log_name) + 1; + size_t log_name_len = strlen(log_name) + 1; THD *tmp; bool result = 0; @@ -1284,8 +1284,8 @@ int cmp_master_pos(const char* log_file_ const char* log_file_name2, ulonglong log_pos2) { int res; - uint log_file_name1_len= strlen(log_file_name1); - uint log_file_name2_len= strlen(log_file_name2); + size_t log_file_name1_len= strlen(log_file_name1); + size_t log_file_name2_len= strlen(log_file_name2); // We assume that both log names match up to '.' if (log_file_name1_len == log_file_name2_len) @@ -1580,7 +1580,7 @@ int log_loaded_block(IO_CACHE* file) lf_info->last_pos_in_file >= my_b_get_pos_in_file(file)) DBUG_RETURN(0); - for (block_len= my_b_get_bytes_in_buffer(file); block_len > 0; + for (block_len= (uint) (my_b_get_bytes_in_buffer(file)); block_len > 0; buffer += min(block_len, max_event_size), block_len -= min(block_len, max_event_size)) { diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc --- a/sql/sql_select.cc 2008-03-28 16:01:01 -04:00 +++ b/sql/sql_select.cc 2008-04-09 12:43:36 -04:00 @@ -7572,7 +7572,7 @@ static int compare_fields_by_table_order if (outer_ref) return cmp; JOIN_TAB **idx= (JOIN_TAB **) table_join_idx; - cmp= idx[field2->field->table->tablenr]-idx[field1->field->table->tablenr]; + cmp= (uint) (idx[field2->field->table->tablenr] - idx[field1->field->table->tablenr]); return cmp < 0 ? -1 : (cmp ? 1 : 0); } @@ -9589,7 +9589,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA table->s->default_values= table->record[1]+alloc_length; } copy_func[0]=0; // End marker - param->func_count= copy_func - param->items_to_copy; + param->func_count= (uint) (copy_func - param->items_to_copy); recinfo=param->start_recinfo; null_flags=(uchar*) table->record[0]; @@ -15143,10 +15143,10 @@ static void select_describe(JOIN *join, item_list.push_back(new Item_int((int32) join->select_lex->select_number)); item_list.push_back(new Item_string(join->select_lex->type, - strlen(join->select_lex->type), cs)); + (uint) strlen(join->select_lex->type), cs)); for (uint i=0 ; i < 7; i++) item_list.push_back(item_null); - item_list.push_back(new Item_string(message,strlen(message),cs)); + item_list.push_back(new Item_string(message,(uint) strlen(message),cs)); if (result->send_data(item_list)) join->error= 1; } @@ -15165,7 +15165,7 @@ static void select_describe(JOIN *join, item_list.push_back(new Item_null); /* select_type */ item_list.push_back(new Item_string(join->select_lex->type, - strlen(join->select_lex->type), + (uint) strlen(join->select_lex->type), cs)); /* table */ { @@ -15192,7 +15192,7 @@ static void select_describe(JOIN *join, } /* type */ item_list.push_back(new Item_string(join_type_str[JT_ALL], - strlen(join_type_str[JT_ALL]), + (uint) strlen(join_type_str[JT_ALL]), cs)); /* possible_keys */ item_list.push_back(item_null); @@ -15241,7 +15241,7 @@ static void select_describe(JOIN *join, join->select_lex->select_number)); /* select_type */ item_list.push_back(new Item_string(join->select_lex->type, - strlen(join->select_lex->type), + (uint) strlen(join->select_lex->type), cs)); if (tab->type == JT_ALL && tab->select && tab->select->quick) { @@ -15266,12 +15266,12 @@ static void select_describe(JOIN *join, { TABLE_LIST *real_table= table->pos_in_table_list; item_list.push_back(new Item_string(real_table->alias, - strlen(real_table->alias), + (uint) strlen(real_table->alias), cs)); } /* type */ item_list.push_back(new Item_string(join_type_str[tab->type], - strlen(join_type_str[tab->type]), + (uint) strlen(join_type_str[tab->type]), cs)); /* Build "possible_keys" value and add it to item_list */ if (!tab->keys.is_clear_all()) @@ -15284,7 +15284,7 @@ static void select_describe(JOIN *join, if (tmp1.length()) tmp1.append(','); tmp1.append(table->key_info[j].name, - strlen(table->key_info[j].name), + (uint) strlen(table->key_info[j].name), system_charset_info); } } @@ -15300,17 +15300,17 @@ static void select_describe(JOIN *join, KEY *key_info=table->key_info+ tab->ref.key; register uint length; item_list.push_back(new Item_string(key_info->name, - strlen(key_info->name), + (uint) strlen(key_info->name), system_charset_info)); - length= longlong2str(tab->ref.key_length, keylen_str_buf, 10) - - keylen_str_buf; + length= (uint) (longlong2str(tab->ref.key_length, keylen_str_buf, 10) - + keylen_str_buf); item_list.push_back(new Item_string(keylen_str_buf, length, system_charset_info)); for (store_key **ref=tab->ref.key_copy ; *ref ; ref++) { if (tmp2.length()) tmp2.append(','); - tmp2.append((*ref)->name(), strlen((*ref)->name()), + tmp2.append((*ref)->name(), (uint) strlen((*ref)->name()), system_charset_info); } item_list.push_back(new Item_string(tmp2.ptr(),tmp2.length(),cs)); @@ -15320,9 +15320,9 @@ static void select_describe(JOIN *join, KEY *key_info=table->key_info+ tab->index; register uint length; item_list.push_back(new Item_string(key_info->name, - strlen(key_info->name),cs)); - length= longlong2str(key_info->key_length, keylen_str_buf, 10) - - keylen_str_buf; + (uint) strlen(key_info->name),cs)); + length= (uint) (longlong2str(key_info->key_length, keylen_str_buf, 10) - + keylen_str_buf); item_list.push_back(new Item_string(keylen_str_buf, length, system_charset_info)); @@ -15355,7 +15355,7 @@ static void select_describe(JOIN *join, key_read=1; if (tab->info) - item_list.push_back(new Item_string(tab->info,strlen(tab->info),cs)); + item_list.push_back(new Item_string(tab->info,(uint) strlen(tab->info),cs)); else if (tab->packed_info & TAB_INFO_HAVE_VALUE) { if (tab->packed_info & TAB_INFO_USING_INDEX) @@ -15679,7 +15679,7 @@ void TABLE_LIST::print(THD *thd, String if (schema_table) { append_identifier(thd, str, schema_table_name, - strlen(schema_table_name)); + (uint) strlen(schema_table_name)); cmp_name= schema_table_name; } else @@ -15704,7 +15704,7 @@ void TABLE_LIST::print(THD *thd, String } } - append_identifier(thd, str, t_alias, strlen(t_alias)); + append_identifier(thd, str, t_alias, (uint) strlen(t_alias)); } if (use_index) diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc --- a/sql/sql_show.cc 2008-03-19 09:32:27 -04:00 +++ b/sql/sql_show.cc 2008-04-09 12:43:36 -04:00 @@ -352,9 +352,9 @@ find_files(THD *thd, List<char> *files, if (db && !(col_access & TABLE_ACLS)) { table_list.db= (char*) db; - table_list.db_length= strlen(db); + table_list.db_length= (uint) strlen(db); table_list.table_name= file->name; - table_list.table_name_length= strlen(file->name); + table_list.table_name_length= (uint) strlen(file->name); table_list.grant.privilege=col_access; if (check_grant(thd, TABLE_ACLS, &table_list, 1, 1, 1)) continue; @@ -520,12 +520,12 @@ bool mysqld_show_create_db(THD *thd, cha DBUG_RETURN(TRUE); protocol->prepare_for_resend(); - protocol->store(dbname, strlen(dbname), system_charset_info); + protocol->store(dbname, (uint) strlen(dbname), system_charset_info); buffer.length(0); buffer.append(STRING_WITH_LEN("CREATE DATABASE ")); if (create_options & HA_LEX_CREATE_IF_NOT_EXISTS) buffer.append(STRING_WITH_LEN("/*!32312 IF NOT EXISTS*/ ")); - append_identifier(thd, &buffer, dbname, strlen(dbname)); + append_identifier(thd, &buffer, dbname, (uint) strlen(dbname)); if (create.default_table_charset) { @@ -885,7 +885,7 @@ store_create_info(THD *thd, TABLE_LIST * else alias= (lower_case_table_names == 2 ? table->alias : share->table_name); - append_identifier(thd, packet, alias, strlen(alias)); + append_identifier(thd, packet, alias, (uint) strlen(alias)); packet->append(STRING_WITH_LEN(" (\n")); for (ptr=table->field ; (field= *ptr); ptr++) @@ -896,7 +896,7 @@ store_create_info(THD *thd, TABLE_LIST * packet->append(STRING_WITH_LEN(",\n")); packet->append(STRING_WITH_LEN(" ")); - append_identifier(thd,packet,field->field_name, strlen(field->field_name)); + append_identifier(thd,packet,field->field_name, (uint) strlen(field->field_name)); packet->append(' '); // check for surprises from the previous call to Field::sql_type() if (type.ptr() != tmp) @@ -983,7 +983,7 @@ store_create_info(THD *thd, TABLE_LIST * packet->append(STRING_WITH_LEN("KEY ")); if (!found_primary) - append_identifier(thd, packet, key_info->name, strlen(key_info->name)); + append_identifier(thd, packet, key_info->name, (uint) strlen(key_info->name)); if (!(thd->variables.sql_mode & MODE_NO_KEY_OPTIONS) && !limited_mysql_mode && !foreign_db_mode) @@ -1010,7 +1010,7 @@ store_create_info(THD *thd, TABLE_LIST * if (key_part->field) append_identifier(thd,packet,key_part->field->field_name, - strlen(key_part->field->field_name)); + (uint) strlen(key_part->field->field_name)); if (key_part->field && (key_part->length != table->field[key_part->fieldnr-1]->key_length() && @@ -1034,7 +1034,7 @@ store_create_info(THD *thd, TABLE_LIST * if ((for_str= file->get_foreign_key_create_info())) { - packet->append(for_str, strlen(for_str)); + packet->append(for_str, (uint) strlen(for_str)); file->free_foreign_key_create_info(for_str); } @@ -1439,7 +1439,7 @@ static bool show_status_array(THD *thd, char buff[1024], *prefix_end; /* the variable name should not be longer then 80 characters */ char name_buffer[80]; - int len; + size_t len; LEX_STRING null_lex_str; DBUG_ENTER("show_status_array"); @@ -1447,11 +1447,11 @@ static bool show_status_array(THD *thd, null_lex_str.length= 0; prefix_end=strnmov(name_buffer, prefix, sizeof(name_buffer)-1); - len=name_buffer + sizeof(name_buffer) - prefix_end; + len= name_buffer + sizeof(name_buffer) - prefix_end; for (; variables->name; variables++) { - strnmov(prefix_end, variables->name, len); + strnmov(prefix_end, variables->name, (uint) len); name_buffer[sizeof(name_buffer)-1]=0; /* Safety */ SHOW_TYPE show_type=variables->type; if (show_type == SHOW_VARS) @@ -1766,7 +1766,7 @@ static bool show_status_array(THD *thd, const char *p= SSL_get_cipher_list((SSL*) thd->net.vio->ssl_arg,i); if (p == NULL) break; - to= strnmov(to, p, buff_end-to-1); + to= strnmov(to, p, (uint) (buff_end-to-1)); *to++= ':'; } if (to != buff) @@ -1795,7 +1795,7 @@ static bool show_status_array(THD *thd, break; } restore_record(table, s->default_values); - table->field[0]->store(name_buffer, strlen(name_buffer), + table->field[0]->store(name_buffer, (uint) strlen(name_buffer), system_charset_info); table->field[1]->store(pos, (uint32) (end - pos), system_charset_info); if (schema_table_store_record(thd, table)) @@ -1914,9 +1914,9 @@ int make_table_list(THD *thd, SELECT_LEX Table_ident *table_ident; LEX_STRING ident_db, ident_table; ident_db.str= db; - ident_db.length= strlen(db); + ident_db.length= (uint) strlen(db); ident_table.str= table; - ident_table.length= strlen(table); + ident_table.length= (uint) strlen(table); table_ident= new Table_ident(thd, ident_db, ident_table, 1); sel->init_query(); if (!sel->add_table_to_list(thd, table_ident, 0, 0, TL_READ, @@ -1946,12 +1946,12 @@ bool uses_only_table_name_fields(Item *i const char *field_name1= schema_table->idx_field1 >= 0 ? field_info[schema_table->idx_field1].field_name : ""; const char *field_name2= schema_table->idx_field2 >= 0 ? field_info[schema_table->idx_field2].field_name : ""; if (table->table != item_field->field->table || - (cs->coll->strnncollsp(cs, (uchar *) field_name1, strlen(field_name1), + (cs->coll->strnncollsp(cs, (uchar *) field_name1, (uint) strlen(field_name1), (uchar *) item_field->field_name, - strlen(item_field->field_name), 0) && - cs->coll->strnncollsp(cs, (uchar *) field_name2, strlen(field_name2), + (uint) strlen(item_field->field_name), 0) && + cs->coll->strnncollsp(cs, (uchar *) field_name2, (uint) strlen(field_name2), (uchar *) item_field->field_name, - strlen(item_field->field_name), 0))) + (uint) strlen(item_field->field_name), 0))) return 0; } else if (item->type() == Item::REF_ITEM) @@ -2282,9 +2282,9 @@ int get_all_tables(THD *thd, TABLE_LIST { restore_record(table, s->default_values); table->field[schema_table->idx_field1]-> - store(base_name, strlen(base_name), system_charset_info); + store(base_name, (uint) strlen(base_name), system_charset_info); table->field[schema_table->idx_field2]-> - store(file_name, strlen(file_name),system_charset_info); + store(file_name, (uint) strlen(file_name),system_charset_info); if (!partial_cond || partial_cond->val_int()) { if (schema_table_idx == SCH_TABLE_NAMES) @@ -2392,9 +2392,9 @@ bool store_schema_shemata(THD* thd, TABL CHARSET_INFO *cs) { restore_record(table, s->default_values); - table->field[1]->store(db_name, strlen(db_name), system_charset_info); - table->field[2]->store(cs->csname, strlen(cs->csname), system_charset_info); - table->field[3]->store(cs->name, strlen(cs->name), system_charset_info); + table->field[1]->store(db_name, (uint) strlen(db_name), system_charset_info); + table->field[2]->store(cs->csname, (uint) strlen(cs->csname), system_charset_info); + table->field[3]->store(cs->name, (uint) strlen(cs->name), system_charset_info); return schema_table_store_record(thd, table); } @@ -2460,8 +2460,8 @@ static int get_schema_tables_record(THD DBUG_ENTER("get_schema_tables_record"); restore_record(table, s->default_values); - table->field[1]->store(base_name, strlen(base_name), cs); - table->field[2]->store(file_name, strlen(file_name), cs); + table->field[1]->store(base_name, (uint) strlen(base_name), cs); + table->field[2]->store(file_name, (uint) strlen(file_name), cs); if (res) { /* @@ -2474,7 +2474,7 @@ static int get_schema_tables_record(THD table->field[3]->store(STRING_WITH_LEN("SYSTEM VIEW"), cs); else table->field[3]->store(STRING_WITH_LEN("BASE TABLE"), cs); - table->field[20]->store(error, strlen(error), cs); + table->field[20]->store(error, (uint) strlen(error), cs); thd->clear_error(); } else if (tables->view) @@ -2504,7 +2504,7 @@ static int get_schema_tables_record(THD table->field[i]->set_notnull(); } tmp_buff= file->table_type(); - table->field[4]->store(tmp_buff, strlen(tmp_buff), cs); + table->field[4]->store(tmp_buff, (uint) strlen(tmp_buff), cs); table->field[5]->store((longlong) share->frm_version, TRUE); enum row_type row_type = file->get_row_type(); switch (row_type) { @@ -2531,7 +2531,7 @@ static int get_schema_tables_record(THD tmp_buff= "Compact"; break; } - table->field[6]->store(tmp_buff, strlen(tmp_buff), cs); + table->field[6]->store(tmp_buff, (uint) strlen(tmp_buff), cs); if (!tables->schema_table) { table->field[7]->store((longlong) file->records, TRUE); @@ -2573,7 +2573,7 @@ static int get_schema_tables_record(THD } tmp_buff= (share->table_charset ? share->table_charset->name : "default"); - table->field[17]->store(tmp_buff, strlen(tmp_buff), cs); + table->field[17]->store(tmp_buff, (uint) strlen(tmp_buff), cs); if (file->table_flags() & (ulong) HA_HAS_CHECKSUM) { table->field[18]->store((longlong) file->checksum(), TRUE); @@ -2629,7 +2629,7 @@ static int get_schema_tables_record(THD table->field[20]->store(comment, (comment == share->comment.str ? share->comment.length : - strlen(comment)), cs); + (uint) strlen(comment)), cs); if (comment != share->comment.str) my_free(comment, MYF(0)); } @@ -2675,8 +2675,8 @@ static int get_schema_column_record(THD count= 0; file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); restore_record(show_table, s->default_values); - base_name_length= strlen(base_name); - file_name_length= strlen(file_name); + base_name_length= (uint) strlen(base_name); + file_name_length= (uint) strlen(file_name); for (ptr=show_table->field; (field= *ptr) ; ptr++) { @@ -2721,13 +2721,13 @@ static int get_schema_column_record(THD #endif table->field[1]->store(base_name, base_name_length, cs); table->field[2]->store(file_name, file_name_length, cs); - table->field[3]->store(field->field_name, strlen(field->field_name), + table->field[3]->store(field->field_name, (uint) strlen(field->field_name), cs); table->field[4]->store((longlong) count, TRUE); field->sql_type(type); table->field[14]->store(type.ptr(), type.length(), cs); tmp_buff= strchr(type.ptr(), '('); - table->field[7]->store(type.ptr(), + table->field[7]->store(type.ptr(), (uint) (tmp_buff ? tmp_buff - type.ptr() : type.length()), cs); @@ -2739,7 +2739,7 @@ static int get_schema_column_record(THD pos=(byte*) ((flags & NOT_NULL_FLAG) ? "NO" : "YES"); table->field[6]->store((const char*) pos, - strlen((const char*) pos), cs); + (uint) strlen((const char*) pos), cs); is_blob= (field->type() == FIELD_TYPE_BLOB); if (field->has_charset() || is_blob || field->real_type() == MYSQL_TYPE_VARCHAR || // For varbinary type @@ -2807,18 +2807,18 @@ static int get_schema_column_record(THD { pos=(byte*) field->charset()->csname; table->field[12]->store((const char*) pos, - strlen((const char*) pos), cs); + (uint) strlen((const char*) pos), cs); table->field[12]->set_notnull(); pos=(byte*) field->charset()->name; table->field[13]->store((const char*) pos, - strlen((const char*) pos), cs); + (uint) strlen((const char*) pos), cs); table->field[13]->set_notnull(); } pos=(byte*) ((field->flags & PRI_KEY_FLAG) ? "PRI" : (field->flags & UNIQUE_KEY_FLAG) ? "UNI" : (field->flags & MULTIPLE_KEY_FLAG) ? "MUL":""); table->field[15]->store((const char*) pos, - strlen((const char*) pos), cs); + (uint) strlen((const char*) pos), cs); end= tmp; if (field->unireg_check == Field::NEXT_NUMBER) @@ -2851,10 +2851,10 @@ int fill_schema_charsets(THD *thd, TABLE { const char *comment; restore_record(table, s->default_values); - table->field[0]->store(tmp_cs->csname, strlen(tmp_cs->csname), scs); - table->field[1]->store(tmp_cs->name, strlen(tmp_cs->name), scs); + table->field[0]->store(tmp_cs->csname, (uint) strlen(tmp_cs->csname), scs); + table->field[1]->store(tmp_cs->name, (uint) strlen(tmp_cs->name), scs); comment= tmp_cs->comment ? tmp_cs->comment : ""; - table->field[2]->store(comment, strlen(comment), scs); + table->field[2]->store(comment, (uint) strlen(comment), scs); table->field[3]->store((longlong) tmp_cs->mbmaxlen, TRUE); if (schema_table_store_record(thd, table)) return 1; @@ -2888,13 +2888,13 @@ int fill_schema_collation(THD *thd, TABL { const char *tmp_buff; restore_record(table, s->default_values); - table->field[0]->store(tmp_cl->name, strlen(tmp_cl->name), scs); - table->field[1]->store(tmp_cl->csname , strlen(tmp_cl->csname), scs); + table->field[0]->store(tmp_cl->name, (uint) strlen(tmp_cl->name), scs); + table->field[1]->store(tmp_cl->csname , (uint) strlen(tmp_cl->csname), scs); table->field[2]->store((longlong) tmp_cl->number, TRUE); tmp_buff= (tmp_cl->state & MY_CS_PRIMARY) ? "Yes" : ""; - table->field[3]->store(tmp_buff, strlen(tmp_buff), scs); + table->field[3]->store(tmp_buff, (uint) strlen(tmp_buff), scs); tmp_buff= (tmp_cl->state & MY_CS_COMPILED)? "Yes" : ""; - table->field[4]->store(tmp_buff, strlen(tmp_buff), scs); + table->field[4]->store(tmp_buff, (uint) strlen(tmp_buff), scs); table->field[5]->store((longlong) tmp_cl->strxfrm_multiply, TRUE); if (schema_table_store_record(thd, table)) return 1; @@ -2924,8 +2924,8 @@ int fill_schema_coll_charset_app(THD *th !my_charset_same(tmp_cs,tmp_cl)) continue; restore_record(table, s->default_values); - table->field[0]->store(tmp_cl->name, strlen(tmp_cl->name), scs); - table->field[1]->store(tmp_cl->csname , strlen(tmp_cl->csname), scs); + table->field[0]->store(tmp_cl->name, (uint) strlen(tmp_cl->name), scs); + table->field[1]->store(tmp_cl->csname , (uint) strlen(tmp_cl->csname), scs); if (schema_table_store_record(thd, table)) return 1; } @@ -3096,16 +3096,16 @@ static int get_schema_stat_record(THD *t for (uint j=0 ; j < key_info->key_parts ; j++,key_part++) { restore_record(table, s->default_values); - table->field[1]->store(base_name, strlen(base_name), cs); - table->field[2]->store(file_name, strlen(file_name), cs); + table->field[1]->store(base_name, (uint) strlen(base_name), cs); + table->field[2]->store(file_name, (uint) strlen(file_name), cs); table->field[3]->store((longlong) ((key_info->flags & HA_NOSAME) ? 0 : 1), TRUE); - table->field[4]->store(base_name, strlen(base_name), cs); - table->field[5]->store(key_info->name, strlen(key_info->name), cs); + table->field[4]->store(base_name, (uint) strlen(base_name), cs); + table->field[5]->store(key_info->name, (uint) strlen(key_info->name), cs); table->field[6]->store((longlong) (j+1), TRUE); str=(key_part->field ? key_part->field->field_name : "?unknown field?"); - table->field[7]->store(str, strlen(str), cs); + table->field[7]->store(str, (uint) strlen(str), cs); if (show_table->file->index_flags(i, j, 0) & HA_READ_ORDER) { table->field[8]->store(((key_part->key_part_flag & @@ -3132,9 +3132,9 @@ static int get_schema_stat_record(THD *t } uint flags= key_part->field ? key_part->field->flags : 0; const char *pos=(char*) ((flags & NOT_NULL_FLAG) ? "" : "YES"); - table->field[12]->store(pos, strlen(pos), cs); + table->field[12]->store(pos, (uint) strlen(pos), cs); pos= show_table->file->index_type(i); - table->field[13]->store(pos, strlen(pos), cs); + table->field[13]->store(pos, (uint) strlen(pos), cs); if (!show_table->s->keys_in_use.is_set(i)) table->field[14]->store(STRING_WITH_LEN("disabled"), cs); else @@ -3229,7 +3229,7 @@ static int get_schema_views_record(THD * table->field[5]->store(STRING_WITH_LEN("YES"), cs); else table->field[5]->store(STRING_WITH_LEN("NO"), cs); - definer_len= (strxmov(definer, tables->definer.user.str, "@", + definer_len= (uint) (strxmov(definer, tables->definer.user.str, "@", tables->definer.host.str, NullS) - definer); table->field[6]->store(definer, definer_len, cs); if (tables->view_suid) @@ -3254,10 +3254,10 @@ bool store_constraints(THD *thd, TABLE * { CHARSET_INFO *cs= system_charset_info; restore_record(table, s->default_values); - table->field[1]->store(db, strlen(db), cs); + table->field[1]->store(db, (uint) strlen(db), cs); table->field[2]->store(key_name, key_len, cs); - table->field[3]->store(db, strlen(db), cs); - table->field[4]->store(tname, strlen(tname), cs); + table->field[3]->store(db, (uint) strlen(db), cs); + table->field[4]->store(tname, (uint) strlen(tname), cs); table->field[5]->store(con_type, con_len, cs); return schema_table_store_record(thd, table); } @@ -3294,14 +3294,14 @@ static int get_schema_constraints_record if (i == primary_key && !strcmp(key_info->name, primary_key_name)) { if (store_constraints(thd, table, base_name, file_name, key_info->name, - strlen(key_info->name), + (uint) strlen(key_info->name), STRING_WITH_LEN("PRIMARY KEY"))) DBUG_RETURN(1); } else if (key_info->flags & HA_NOSAME) { if (store_constraints(thd, table, base_name, file_name, key_info->name, - strlen(key_info->name), + (uint) strlen(key_info->name), STRING_WITH_LEN("UNIQUE"))) DBUG_RETURN(1); } @@ -3314,7 +3314,7 @@ static int get_schema_constraints_record { if (store_constraints(thd, table, base_name, file_name, f_key_info->forein_id->str, - strlen(f_key_info->forein_id->str), + (uint) strlen(f_key_info->forein_id->str), "FOREIGN KEY", 11)) DBUG_RETURN(1); } @@ -3336,12 +3336,12 @@ static bool store_trigger(THD *thd, TABL ulong sql_mode_len; restore_record(table, s->default_values); - table->field[1]->store(db, strlen(db), cs); + table->field[1]->store(db, (uint) strlen(db), cs); table->field[2]->store(trigger_name->str, trigger_name->length, cs); table->field[3]->store(trg_event_type_names[event].str, trg_event_type_names[event].length, cs); - table->field[5]->store(db, strlen(db), cs); - table->field[6]->store(tname, strlen(tname), cs); + table->field[5]->store(db, (uint) strlen(db), cs); + table->field[6]->store(tname, (uint) strlen(tname), cs); table->field[9]->store(trigger_stmt->str, trigger_stmt->length, cs); table->field[10]->store(STRING_WITH_LEN("ROW"), cs); table->field[11]->store(trg_action_time_type_names[timing].str, @@ -3425,10 +3425,10 @@ void store_key_column_usage(TABLE *table const char *con_type, uint con_len, longlong idx) { CHARSET_INFO *cs= system_charset_info; - table->field[1]->store(db, strlen(db), cs); + table->field[1]->store(db, (uint) strlen(db), cs); table->field[2]->store(key_name, key_len, cs); - table->field[4]->store(db, strlen(db), cs); - table->field[5]->store(tname, strlen(tname), cs); + table->field[4]->store(db, (uint) strlen(db), cs); + table->field[5]->store(tname, (uint) strlen(tname), cs); table->field[6]->store(con_type, con_len, cs); table->field[7]->store((longlong) idx, TRUE); } @@ -3472,9 +3472,9 @@ static int get_schema_key_column_usage_r restore_record(table, s->default_values); store_key_column_usage(table, base_name, file_name, key_info->name, - strlen(key_info->name), + (uint) strlen(key_info->name), key_part->field->field_name, - strlen(key_part->field->field_name), + (uint) strlen(key_part->field->field_name), (longlong) f_idx); if (schema_table_store_record(thd, table)) DBUG_RETURN(1); @@ -3538,8 +3538,8 @@ int fill_open_tables(THD *thd, TABLE_LIS for (; open_list ; open_list=open_list->next) { restore_record(table, s->default_values); - table->field[0]->store(open_list->db, strlen(open_list->db), cs); - table->field[1]->store(open_list->table, strlen(open_list->table), cs); + table->field[0]->store(open_list->db, (uint) strlen(open_list->db), cs); + table->field[1]->store(open_list->table, (uint) strlen(open_list->table), cs); table->field[2]->store((longlong) open_list->in_use, TRUE); table->field[3]->store((longlong) open_list->locked, TRUE); if (schema_table_store_record(thd, table)) @@ -3673,7 +3673,7 @@ TABLE *create_schema_table(THD *thd, TAB } item->max_length= fields_info->field_length * cs->mbmaxlen; item->set_name(fields_info->field_name, - strlen(fields_info->field_name), cs); + (uint) strlen(fields_info->field_name), cs); break; } field_list.push_back(item); @@ -3726,7 +3726,7 @@ int make_old_format(THD *thd, ST_SCHEMA_ if (field) { field->set_name(field_info->old_name, - strlen(field_info->old_name), + (uint) strlen(field_info->old_name), system_charset_info); if (add_item_to_list(thd, field)) return 1; @@ -3795,7 +3795,7 @@ int make_table_names_old_format(THD *thd field= new Item_field(context, NullS, NullS, field_info->field_name); if (add_item_to_list(thd, field)) return 1; - field->set_name(field_info->old_name, strlen(field_info->old_name), + field->set_name(field_info->old_name, (uint) strlen(field_info->old_name), system_charset_info); } return 0; @@ -3821,7 +3821,7 @@ int make_columns_old_format(THD *thd, ST if (field) { field->set_name(field_info->old_name, - strlen(field_info->old_name), + (uint) strlen(field_info->old_name), system_charset_info); if (add_item_to_list(thd, field)) return 1; @@ -3846,7 +3846,7 @@ int make_character_sets_old_format(THD * if (field) { field->set_name(field_info->old_name, - strlen(field_info->old_name), + (uint) strlen(field_info->old_name), system_charset_info); if (add_item_to_list(thd, field)) return 1; @@ -3871,7 +3871,7 @@ int make_proc_old_format(THD *thd, ST_SC if (field) { field->set_name(field_info->old_name, - strlen(field_info->old_name), + (uint) strlen(field_info->old_name), system_charset_info); if (add_item_to_list(thd, field)) return 1; @@ -3917,7 +3917,7 @@ int mysql_schema_table(THD *thd, LEX *le table_list->schema_table_name, table_list->alias); table_list->table_name= (char*) table->s->table_name; - table_list->table_name_length= strlen(table->s->table_name); + table_list->table_name_length= (uint) strlen(table->s->table_name); table_list->table= table; table->next= thd->derived_tables; thd->derived_tables= table; @@ -3993,7 +3993,7 @@ int make_schema_select(THD *thd, SELECT_ make_lex_string(thd, &db, INFORMATION_SCHEMA_NAME.str, INFORMATION_SCHEMA_NAME.length, 0); make_lex_string(thd, &table, schema_table->table_name, - strlen(schema_table->table_name), 0); + (uint) strlen(schema_table->table_name), 0); if (schema_table->old_format(thd, schema_table) || /* Handle old syntax */ !sel->add_table_to_list(thd, new Table_ident(thd, db, table, 0), 0, 0, TL_READ, (List<String> *) 0, diff -Nrup a/sql/sql_string.cc b/sql/sql_string.cc --- a/sql/sql_string.cc 2007-12-19 08:48:55 -05:00 +++ b/sql/sql_string.cc 2008-04-09 12:43:37 -04:00 @@ -468,7 +468,7 @@ bool String::append(const char *s,uint32 bool String::append(const char *s) { - return append(s, strlen(s)); + return append(s, (uint) strlen(s)); } @@ -1003,7 +1003,7 @@ outp: } } *from_end_pos= from; - res= to - to_start; + res= (uint) (to - to_start); } return (uint32) res; } diff -Nrup a/sql/sql_table.cc b/sql/sql_table.cc --- a/sql/sql_table.cc 2008-01-23 10:01:29 -05:00 +++ b/sql/sql_table.cc 2008-04-09 12:43:37 -04:00 @@ -66,8 +66,8 @@ static void set_tmp_file_path(char *buf, uint build_table_path(char *buff, size_t bufflen, const char *db, const char *table, const char *ext) { - strxnmov(buff, bufflen-1, mysql_data_home, "/", db, "/", table, ext, - NullS); + strxnmov(buff, (uint) (bufflen - 1), mysql_data_home, "/", db, "/", table, + ext, NullS); return unpack_filename(buff,buff); } @@ -2522,7 +2522,7 @@ send_result_message: case HA_ADMIN_WRONG_CHECKSUM: { protocol->store(STRING_WITH_LEN("note"), system_charset_info); - protocol->store(ER(ER_VIEW_CHECKSUM), strlen(ER(ER_VIEW_CHECKSUM)), + protocol->store(ER(ER_VIEW_CHECKSUM), (uint) strlen(ER(ER_VIEW_CHECKSUM)), system_charset_info); break; } @@ -4428,7 +4428,7 @@ static bool check_engine(THD *thd, const static void set_tmp_file_path(char *buf, size_t bufsize, THD *thd) { - char *p= strnmov(buf, mysql_tmpdir, bufsize); + char *p= strnmov(buf, mysql_tmpdir, (uint) bufsize); my_snprintf(p, bufsize - (p - buf), "%s%lx_%lx_%x%s", tmp_file_prefix, current_pid, thd->thread_id, thd->tmp_table++, reg_ext); diff -Nrup a/sql/sql_trigger.cc b/sql/sql_trigger.cc --- a/sql/sql_trigger.cc 2007-09-04 18:40:25 -04:00 +++ b/sql/sql_trigger.cc 2008-04-09 12:43:37 -04:00 @@ -459,12 +459,12 @@ bool Table_triggers_list::create_trigger strxnmov(dir_buff, FN_REFLEN, mysql_data_home, "/", tables->db, "/", NullS); dir.length= unpack_filename(dir_buff, dir_buff); dir.str= dir_buff; - file.length= strxnmov(file_buff, FN_REFLEN, tables->table_name, - triggers_file_ext, NullS) - file_buff; + file.length= (uint) (strxnmov(file_buff, FN_REFLEN, tables->table_name, + triggers_file_ext, NullS) - file_buff); file.str= file_buff; - trigname_file.length= strxnmov(trigname_buff, FN_REFLEN, + trigname_file.length= (uint) (strxnmov(trigname_buff, FN_REFLEN, lex->spname->m_name.str, - trigname_file_ext, NullS) - trigname_buff; + trigname_file_ext, NullS) - trigname_buff); trigname_file.str= trigname_buff; strxnmov(trigname_path, FN_REFLEN, dir_buff, trigname_buff, NullS); @@ -524,8 +524,8 @@ bool Table_triggers_list::create_trigger definer_host= lex->definer->host; trg_definer->str= trg_definer_holder; - trg_definer->length= strxmov(trg_definer->str, definer_user.str, "@", - definer_host.str, NullS) - trg_definer->str; + trg_definer->length= (uint) (strxmov(trg_definer->str, definer_user.str, "@", + definer_host.str, NullS) - trg_definer->str); } else { @@ -559,9 +559,9 @@ bool Table_triggers_list::create_trigger } stmt_query->append(thd->lex->stmt_definition_begin, - (char *) thd->lex->sphead->m_body_begin - + (uint) ((char *) thd->lex->sphead->m_body_begin - thd->lex->stmt_definition_begin + - thd->lex->sphead->m_body.length); + thd->lex->sphead->m_body.length)); trg_def->str= stmt_query->c_ptr(); trg_def->length= stmt_query->length(); @@ -651,8 +651,8 @@ static bool save_trigger_file(Table_trig strxnmov(dir_buff, FN_REFLEN, mysql_data_home, "/", db, "/", NullS); dir.length= unpack_filename(dir_buff, dir_buff); dir.str= dir_buff; - file.length= strxnmov(file_buff, FN_REFLEN, table_name, triggers_file_ext, - NullS) - file_buff; + file.length= (uint) (strxnmov(file_buff, FN_REFLEN, table_name, triggers_file_ext, + NullS) - file_buff); file.str= file_buff; return sql_create_definition_file(&dir, &file, &triggers_file_type, @@ -960,7 +960,7 @@ bool Table_triggers_list::check_n_load(T save_db.str= thd->db; save_db.length= thd->db_length; - thd->reset_db((char*) db, strlen(db)); + thd->reset_db((char*) db, (uint) strlen(db)); while ((trg_create_str= it++)) { trg_sql_mode= itm++; @@ -1151,8 +1151,8 @@ bool Table_triggers_list::get_trigger_in } else { - definer->length= strxmov(definer->str, body->m_definer_user.str, "@", - body->m_definer_host.str, NullS) - definer->str; + definer->length= (uint) (strxmov(definer->str, body->m_definer_user.str, "@", + body->m_definer_host.str, NullS) - definer->str); } DBUG_RETURN(0); @@ -1348,7 +1348,7 @@ Table_triggers_list::change_table_name_i /* Construct CREATE TRIGGER statement with new table name. */ buff.length(0); - before_on_len= on_table_name->str - def->str; + before_on_len= (uint) (on_table_name->str - def->str); buff.append(def->str, before_on_len); buff.append(STRING_WITH_LEN("ON ")); append_identifier(thd, &buff, new_table_name->str, new_table_name->length); @@ -1418,8 +1418,8 @@ Table_triggers_list::change_table_name_i while ((trigger= it_name++) != stopper) { - trigname_file.length= strxnmov(trigname_buff, FN_REFLEN, trigger->str, - trigname_file_ext, NullS) - trigname_buff; + trigname_file.length= (uint) (strxnmov(trigname_buff, FN_REFLEN, trigger->str, + trigname_file_ext, NullS) - trigname_buff); trigname_file.str= trigname_buff; trigname.trigger_table= *new_table_name; @@ -1480,8 +1480,8 @@ bool Table_triggers_list::change_table_n } if (table.triggers) { - LEX_STRING_WITH_INIT old_table_name(old_table, strlen(old_table)); - LEX_STRING_WITH_INIT new_table_name(new_table, strlen(new_table)); + LEX_STRING_WITH_INIT old_table_name(old_table, (uint) strlen(old_table)); + LEX_STRING_WITH_INIT new_table_name(new_table, (uint) strlen(new_table)); /* Since triggers should be in the same schema as their subject tables moving table with them between two schemas raises too many questions. diff -Nrup a/sql/sql_udf.cc b/sql/sql_udf.cc --- a/sql/sql_udf.cc 2007-11-09 05:41:46 -05:00 +++ b/sql/sql_udf.cc 2008-04-09 12:43:37 -04:00 @@ -182,7 +182,7 @@ void udf_init() DBUG_PRINT("info",("init udf record")); LEX_STRING name; name.str=get_field(&mem, table->field[0]); - name.length = strlen(name.str); + name.length = (uint) strlen(name.str); char *dl_name= get_field(&mem, table->field[2]); bool new_dl=0; Item_udftype udftype=UDFTYPE_FUNCTION; diff -Nrup a/sql/sql_view.cc b/sql/sql_view.cc --- a/sql/sql_view.cc 2008-02-21 12:58:27 -05:00 +++ b/sql/sql_view.cc 2008-04-09 12:43:37 -04:00 @@ -773,11 +773,11 @@ static int mysql_register_view(THD *thd, view->query.str= str.c_ptr_safe(); view->query.length= str.length(); view->source.str= thd->query + thd->lex->create_view_select_start; - view->source.length= (char *)skip_rear_comments(thd->charset(), + view->source.length= (uint) ((char *)skip_rear_comments(thd->charset(), (char *)view->source.str, (char *)thd->query + thd->query_length) - - view->source.str; + view->source.str); view->file_version= 1; view->calc_md5(md5); view->md5.str= md5; @@ -824,10 +824,10 @@ loop_out: mysql_data_home, view->db); unpack_filename(dir_buff, dir_buff); dir.str= dir_buff; - dir.length= strlen(dir_buff); + dir.length= (uint) strlen(dir_buff); file.str= file_buff; - file.length= (strxnmov(file_buff, FN_REFLEN, view->table_name, reg_ext, + file.length= (uint) (strxnmov(file_buff, FN_REFLEN, view->table_name, reg_ext, NullS) - file_buff); /* init timestamp */ if (!view->timestamp.str) @@ -841,7 +841,7 @@ loop_out: path.str= path_buff; fn_format(path_buff, file.str, dir.str, 0, MY_UNPACK_FILENAME); - path.length= strlen(path_buff); + path.length= (uint) strlen(path_buff); if (!access(path.str, F_OK)) { @@ -1830,7 +1830,7 @@ mysql_rename_view(THD *thd, (void) unpack_filename(view_path, view_path); pathstr.str= (char *)view_path; - pathstr.length= strlen(view_path); + pathstr.length= (uint) strlen(view_path); if ((parser= sql_parse_prepare(&pathstr, thd->mem_root, 1)) && is_equal(&view_type, parser->type())) @@ -1863,10 +1863,10 @@ mysql_rename_view(THD *thd, (void) unpack_filename(dir_buff, dir_buff); pathstr.str= (char*)dir_buff; - pathstr.length= strlen(dir_buff); + pathstr.length= (uint) strlen(dir_buff); file.str= file_buff; - file.length= (strxnmov(file_buff, FN_REFLEN, new_name, reg_ext, NullS) + file.length= (uint) (strxnmov(file_buff, FN_REFLEN, new_name, reg_ext, NullS) - file_buff); if (sql_create_definition_file(&pathstr, &file, view_file_type, diff -Nrup a/sql/table.cc b/sql/table.cc --- a/sql/table.cc 2007-10-10 09:26:01 -04:00 +++ b/sql/table.cc 2008-04-09 12:43:37 -04:00 @@ -471,7 +471,7 @@ int openfrm(THD *thd, const char *name, for (count= 0; count < interval->count; count++) { char *val= (char*) interval->type_names[count]; - interval->type_lengths[count]= strlen(val); + interval->type_lengths[count]= (uint) strlen(val); } interval->type_lengths[count]= 0; } @@ -916,7 +916,7 @@ int openfrm(THD *thd, const char *name, the correct null_bytes can now be set, since bitfields have been taken into account */ - share->null_bytes= (null_pos - (uchar*) outparam->null_flags + + share->null_bytes= (uint) (null_pos - (uchar*) outparam->null_flags + (null_bit_pos + 7) / 8); share->last_null_bit_pos= null_bit_pos; @@ -2996,8 +2996,8 @@ Field_iterator_table_ref::get_or_create_ /* The field belongs to a merge view or information schema table. */ Field_translator *translated_field= view_field_it.field_translator(); nj_col= new Natural_join_column(translated_field, table_ref); - field_count= table_ref->field_translation_end - - table_ref->field_translation; + field_count= (uint) (table_ref->field_translation_end - + table_ref->field_translation); } else { diff -Nrup a/sql/udf_example.c b/sql/udf_example.c --- a/sql/udf_example.c 2007-11-27 10:16:51 -05:00 +++ b/sql/udf_example.c 2008-04-09 12:43:37 -04:00 @@ -1099,7 +1099,7 @@ char * is_const(UDF_INIT *initid, UDF_AR sprintf(result, "not const"); } *is_null= 0; - *length= strlen(result); + *length= (uint) strlen(result); return result; } @@ -1133,7 +1133,7 @@ char * check_const_len(UDF_INIT *initid, char *is_null, char *error __attribute__((unused))) { strmov(result, initid->ptr); - *length= strlen(result); + *length= (uint) strlen(result); *is_null= 0; return result; } diff -Nrup a/sql/uniques.cc b/sql/uniques.cc --- a/sql/uniques.cc 2007-07-01 18:33:22 -04:00 +++ b/sql/uniques.cc 2008-04-09 12:43:37 -04:00 @@ -131,7 +131,7 @@ static double get_merge_buffers_cost(uin total_buf_elems+= *pbuf; *last= total_buf_elems; - int n_buffers= last - first + 1; + size_t n_buffers= last - first + 1; /* Using log2(n)=log(n)/log(2) formula */ return 2*((double)total_buf_elems*elem_size) / IO_SIZE + diff -Nrup a/sql/unireg.cc b/sql/unireg.cc --- a/sql/unireg.cc 2007-12-17 03:45:20 -05:00 +++ b/sql/unireg.cc 2008-04-09 12:43:37 -04:00 @@ -119,7 +119,7 @@ bool mysql_create_frm(THD *thd, my_strin /* Calculate extra data segment length */ str_db_type.str= (char *) ha_get_storage_engine(create_info->db_type); - str_db_type.length= strlen(str_db_type.str); + str_db_type.length= (uint) strlen(str_db_type.str); create_info->extra_size= (2 + str_db_type.length + 2 + create_info->connect_string.length); diff -Nrup a/sql-common/client.c b/sql-common/client.c --- a/sql-common/client.c 2008-03-29 03:52:04 -04:00 +++ b/sql-common/client.c 2008-04-09 12:43:37 -04:00 @@ -3145,7 +3145,7 @@ int STDCALL mysql_set_character_set(MYSQ if (mysql_get_server_version(mysql) < 40100) return 0; sprintf(buff, "SET NAMES %s", cs_name); - if (!mysql_real_query(mysql, buff, strlen(buff))) + if (!mysql_real_query(mysql, buff, (uint) strlen(buff))) { mysql->charset= cs; } diff -Nrup a/sql-common/my_user.c b/sql-common/my_user.c --- a/sql-common/my_user.c 2006-12-23 14:04:29 -05:00 +++ b/sql-common/my_user.c 2008-04-09 12:43:37 -04:00 @@ -44,8 +44,8 @@ void parse_user(const char *user_id_str, } else { - *user_name_len= p - user_id_str; - *host_name_len= user_id_len - *user_name_len - 1; + *user_name_len= (uint) (p - user_id_str); + *host_name_len= (uint) (user_id_len - *user_name_len - 1); memcpy(user_name_str, user_id_str, *user_name_len); memcpy(host_name_str, p + 1, *host_name_len); diff -Nrup a/strings/ctype-mb.c b/strings/ctype-mb.c --- a/strings/ctype-mb.c 2007-06-28 04:34:42 -04:00 +++ b/strings/ctype-mb.c 2008-04-09 12:43:37 -04:00 @@ -37,7 +37,7 @@ uint my_caseup_str_mb(CHARSET_INFO * cs, str++; } } - return str - str_orig; + return (uint) (str - str_orig); } uint my_casedn_str_mb(CHARSET_INFO * cs, char *str) @@ -57,7 +57,7 @@ uint my_casedn_str_mb(CHARSET_INFO * cs, str++; } } - return str - str_orig; + return (uint) (str - str_orig); } uint my_caseup_mb(CHARSET_INFO * cs, char *src, uint srclen, diff -Nrup a/strings/ctype-simple.c b/strings/ctype-simple.c --- a/strings/ctype-simple.c 2007-12-07 05:40:14 -05:00 +++ b/strings/ctype-simple.c 2008-04-09 12:43:37 -04:00 @@ -193,7 +193,7 @@ uint my_caseup_str_8bit(CHARSET_INFO * c char *str_orig= str; while ((*str= (char) map[(uchar) *str]) != 0) str++; - return str - str_orig; + return (uint) (str - str_orig); } @@ -203,7 +203,7 @@ uint my_casedn_str_8bit(CHARSET_INFO * c char *str_orig= str; while ((*str= (char) map[(uchar) *str]) != 0) str++; - return str - str_orig; + return (uint) (str - str_orig); } @@ -1516,7 +1516,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs } } - digits= str - beg; + digits= (int) (str - beg); /* Continue to accumulate into ulonglong */ for (dot= NULL, ull= ul; str < end; str++) @@ -1553,7 +1553,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs } else { - shift= dot - str; + shift= (int) (dot - str); for ( ; str < end && (ch= (unsigned char) (*str - '0')) < 10; str++); } goto exp; @@ -1577,7 +1577,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs /* Unknown character, exit the loop */ break; } - shift= dot ? dot - str : 0; /* Right shift */ + shift= dot ? (int) (dot - str) : 0; /* Right shift */ addon= 0; exp: /* [ E [ <sign> ] <unsigned integer> ] */ diff -Nrup a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c --- a/strings/ctype-ucs2.c 2008-02-20 05:38:49 -05:00 +++ b/strings/ctype-ucs2.c 2008-04-09 12:43:37 -04:00 @@ -1001,7 +1001,7 @@ ulonglong my_strntoull10rnd_ucs2(CHARSET *b++= (char) wc; } - res= my_strntoull10rnd_8bit(cs, buf, b - buf, unsign_fl, endptr, err); + res= my_strntoull10rnd_8bit(cs, buf, (uint) (b - buf), unsign_fl, endptr, err); *endptr= (char*) nptr + 2 * (uint) (*endptr- buf); return res; } diff -Nrup a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c --- a/strings/my_vsnprintf.c 2007-01-22 07:10:43 -05:00 +++ b/strings/my_vsnprintf.c 2008-04-09 12:43:37 -04:00 @@ -107,7 +107,7 @@ int my_vsnprintf(char *to, size_t n, con char *par = va_arg(ap, char *); DBUG_ASSERT(to <= end); if (to + abs(width) + 1 > end) - width= end - to - 1; /* sign doesn't matter */ + width= (uint) (end - to - 1); /* sign doesn't matter */ memmove(to, par, abs(width)); to+= width; continue; diff -Nrup a/strings/xml.c b/strings/xml.c --- a/strings/xml.c 2006-12-23 14:04:31 -05:00 +++ b/strings/xml.c 2008-04-09 12:43:37 -04:00 @@ -147,7 +147,7 @@ static int my_xml_enter(MY_XML_PARSER *s memcpy(st->attrend,str,len); st->attrend+=len; st->attrend[0]='\0'; - return st->enter ? st->enter(st,st->attr,st->attrend-st->attr) : MY_XML_OK; + return st->enter ? st->enter(st,st->attr, (uint) (st->attrend - st->attr)) : MY_XML_OK; } @@ -179,7 +179,7 @@ static int my_xml_leave(MY_XML_PARSER *p return MY_XML_ERROR; } - rc = p->leave_xml ? p->leave_xml(p,p->attr,p->attrend-p->attr) : MY_XML_OK; + rc = p->leave_xml ? p->leave_xml(p,p->attr, (uint) (p->attrend - p->attr)) : MY_XML_OK; *e='\0'; p->attrend=e; diff -Nrup a/tests/bug25714.c b/tests/bug25714.c --- a/tests/bug25714.c 2007-11-19 10:59:20 -05:00 +++ b/tests/bug25714.c 2008-04-09 12:43:37 -04:00 @@ -54,14 +54,14 @@ int main (int argc, char **argv) printf("%s\n", mysql_error(&conn)); } - OK = mysql_real_query (&conn, query4, strlen(query4)); + OK = mysql_real_query (&conn, query4, (uint) strlen(query4)); assert(0 == OK); printf("%ld inserted\n", (long) mysql_insert_id(&conn)); - OK = mysql_real_query (&conn, query5, strlen(query5)); + OK = mysql_real_query (&conn, query5, (uint) strlen(query5)); assert(0 == OK); diff -Nrup a/tests/mysql_client_test.c b/tests/mysql_client_test.c --- a/tests/mysql_client_test.c 2008-03-28 16:01:01 -04:00 +++ b/tests/mysql_client_test.c 2008-04-09 12:43:37 -04:00 @@ -256,7 +256,7 @@ static MYSQL_STMT *STDCALL mysql_simple_prepare(MYSQL *mysql_arg, const char *query) { MYSQL_STMT *stmt= mysql_stmt_init(mysql_arg); - if (stmt && mysql_stmt_prepare(stmt, query, strlen(query))) + if (stmt && mysql_stmt_prepare(stmt, query, (uint) strlen(query))) { mysql_stmt_close(stmt); return 0; @@ -436,7 +436,7 @@ static void my_print_result_metadata(MYS for(i= 0; i< field_count; i++) { field= mysql_fetch_field(result); - j= strlen(field->name); + j= (uint) strlen(field->name); if (j < field->max_length) j= field->max_length; if (j < 4 && !IS_NOT_NULL(field->flags)) @@ -959,7 +959,7 @@ void stmt_fetch_init(Stmt_fetch *fetch, fetch->handle= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(fetch->handle, fetch->query, strlen(fetch->query)); + rc= mysql_stmt_prepare(fetch->handle, fetch->query, (uint) strlen(fetch->query)); check_execute(fetch->handle, rc); /* @@ -1069,7 +1069,7 @@ my_bool fetch_n(const char **query_list, for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch) { /* Init will exit(1) in case of error */ - stmt_fetch_init(fetch, fetch - fetch_array, + stmt_fetch_init(fetch, (uint) (fetch - fetch_array), query_list[fetch - fetch_array]); } @@ -2341,7 +2341,7 @@ static void test_ps_conj_select() int_data= 1; strmov(str_data, "hh"); - str_length= strlen(str_data); + str_length= (uint) strlen(str_data); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -2852,9 +2852,9 @@ static void test_long_data() data= (char *)"Michael"; /* supply data in pieces */ - rc= mysql_stmt_send_long_data(stmt, 1, data, strlen(data)); + rc= mysql_stmt_send_long_data(stmt, 1, data, (uint) strlen(data)); data= (char *)" 'Monty' Widenius"; - rc= mysql_stmt_send_long_data(stmt, 1, data, strlen(data)); + rc= mysql_stmt_send_long_data(stmt, 1, data, (uint) strlen(data)); check_execute(stmt, rc); rc= mysql_stmt_send_long_data(stmt, 2, "Venu (venu@stripped)", 4); check_execute(stmt, rc); @@ -8432,7 +8432,7 @@ static void test_mem_overun() sprintf(field, "c%d int", i); strxmov(buffer, buffer, field, ", ", NullS); } - length= strlen(buffer); + length= (uint) strlen(buffer); buffer[length-2]= ')'; buffer[--length]= '\0'; @@ -8444,7 +8444,7 @@ static void test_mem_overun() { strxmov(buffer, buffer, "1, ", NullS); } - length= strlen(buffer); + length= (uint) strlen(buffer); buffer[length-2]= ')'; buffer[--length]= '\0'; @@ -8972,7 +8972,7 @@ static void test_bug1500() data= "Dogs"; my_bind[0].buffer_type= MYSQL_TYPE_STRING; my_bind[0].buffer= (void *) data; - my_bind[0].buffer_length= strlen(data); + my_bind[0].buffer_length= (uint) strlen(data); my_bind[0].is_null= 0; my_bind[0].length= 0; @@ -8997,7 +8997,7 @@ static void test_bug1500() data= "Grave"; my_bind[0].buffer_type= MYSQL_TYPE_STRING; my_bind[0].buffer= (void *) data; - my_bind[0].buffer_length= strlen(data); + my_bind[0].buffer_length= (uint) strlen(data); rc= mysql_stmt_bind_param(stmt, my_bind); check_execute(stmt, rc); @@ -9028,7 +9028,7 @@ static void test_bug1946() stmt= mysql_simple_prepare(mysql, query); check_stmt(stmt); - rc= mysql_real_query(mysql, query, strlen(query)); + rc= mysql_real_query(mysql, query, (uint) strlen(query)); DIE_UNLESS(rc != 0); if (!opt_silent) fprintf(stdout, "Got error (as expected):\n"); @@ -10044,7 +10044,7 @@ static void test_bug3035() myheader("test_bug3035"); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE TABLE t1 (i8 TINYINT, ui8 TINYINT UNSIGNED, " @@ -10052,7 +10052,7 @@ static void test_bug3035() "i32 INT, ui32 INT UNSIGNED, " "i64 BIGINT, ui64 BIGINT UNSIGNED, " "id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); bzero((char*) bind_array, sizeof(bind_array)); @@ -10093,7 +10093,7 @@ static void test_bug3035() stmt_text= "INSERT INTO t1 (i8, ui8, i16, ui16, i32, ui32, i64, ui64) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?)"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); mysql_stmt_bind_param(stmt, bind_array); @@ -10126,7 +10126,7 @@ static void test_bug3035() "cast(ui64 as signed), ui64, cast(ui64 as signed)" "FROM t1 ORDER BY id ASC"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -10196,7 +10196,7 @@ static void test_bug3035() mysql_stmt_close(stmt); stmt_text= "DROP TABLE t1"; - mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); } @@ -10259,7 +10259,7 @@ static void test_bug1664() stmt= mysql_stmt_init(mysql); check_stmt(stmt); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); verify_param_count(stmt, 2); @@ -10268,7 +10268,7 @@ static void test_bug1664() my_bind[0].buffer_type= MYSQL_TYPE_STRING; my_bind[0].buffer= (void *)str_data; - my_bind[0].buffer_length= strlen(str_data); + my_bind[0].buffer_length= (uint) strlen(str_data); my_bind[1].buffer= (void *)&int_data; my_bind[1].buffer_type= MYSQL_TYPE_LONG; @@ -10283,7 +10283,7 @@ static void test_bug1664() not break following execution. */ data= ""; - rc= mysql_stmt_send_long_data(stmt, 0, data, strlen(data)); + rc= mysql_stmt_send_long_data(stmt, 0, data, (uint) strlen(data)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -10297,7 +10297,7 @@ static void test_bug1664() /* This should pass OK */ data= (char *)"Data"; - rc= mysql_stmt_send_long_data(stmt, 0, data, strlen(data)); + rc= mysql_stmt_send_long_data(stmt, 0, data, (uint) strlen(data)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -10334,7 +10334,7 @@ static void test_bug1664() */ data= (char *)"SomeOtherData"; - rc= mysql_stmt_send_long_data(stmt, 0, data, strlen(data)); + rc= mysql_stmt_send_long_data(stmt, 0, data, (uint) strlen(data)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -10352,13 +10352,13 @@ static void test_bug1664() /* Now let us test how mysql_stmt_reset works. */ stmt= mysql_stmt_init(mysql); check_stmt(stmt); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_bind_param(stmt, my_bind); check_execute(stmt, rc); data= (char *)"SomeData"; - rc= mysql_stmt_send_long_data(stmt, 0, data, strlen(data)); + rc= mysql_stmt_send_long_data(stmt, 0, data, (uint) strlen(data)); check_execute(stmt, rc); rc= mysql_stmt_reset(stmt); @@ -10484,7 +10484,7 @@ static void test_ps_i18n() myheader("test_ps_i18n"); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); /* @@ -10495,37 +10495,37 @@ static void test_ps_i18n() stmt_text= "CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "SET CHARACTER_SET_CLIENT=koi8r, " "CHARACTER_SET_CONNECTION=cp1251, " "CHARACTER_SET_RESULTS=koi8r"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); bzero((char*) bind_array, sizeof(bind_array)); bind_array[0].buffer_type= MYSQL_TYPE_STRING; bind_array[0].buffer= (void *) koi8; - bind_array[0].buffer_length= strlen(koi8); + bind_array[0].buffer_length= (uint) strlen(koi8); bind_array[1].buffer_type= MYSQL_TYPE_STRING; bind_array[1].buffer= (void *) koi8; - bind_array[1].buffer_length= strlen(koi8); + bind_array[1].buffer_length= (uint) strlen(koi8); stmt= mysql_stmt_init(mysql); check_stmt(stmt); stmt_text= "INSERT INTO t1 (c1, c2) VALUES (?, ?)"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); mysql_stmt_bind_param(stmt, bind_array); - mysql_stmt_send_long_data(stmt, 0, koi8, strlen(koi8)); + mysql_stmt_send_long_data(stmt, 0, koi8, (uint) strlen(koi8)); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -10533,7 +10533,7 @@ static void test_ps_i18n() stmt_text= "SELECT c1, c2 FROM t1"; /* c1 and c2 are binary so no conversion will be done on select */ - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -10561,7 +10561,7 @@ static void test_ps_i18n() DIE_UNLESS(rc == MYSQL_NO_DATA); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); /* @@ -10574,26 +10574,26 @@ static void test_ps_i18n() stmt_text= "CREATE TABLE t1 (c1 VARCHAR(255) CHARACTER SET cp1251, " "c2 VARCHAR(255) CHARACTER SET cp1251)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "INSERT INTO t1 (c1, c2) VALUES (?, ?)"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); /* this data must be converted */ bind_array[0].buffer_type= MYSQL_TYPE_STRING; bind_array[0].buffer= (void *) koi8; - bind_array[0].buffer_length= strlen(koi8); + bind_array[0].buffer_length= (uint) strlen(koi8); bind_array[1].buffer_type= MYSQL_TYPE_STRING; bind_array[1].buffer= (void *) koi8; - bind_array[1].buffer_length= strlen(koi8); + bind_array[1].buffer_length= (uint) strlen(koi8); mysql_stmt_bind_param(stmt, bind_array); - mysql_stmt_send_long_data(stmt, 0, koi8, strlen(koi8)); + mysql_stmt_send_long_data(stmt, 0, koi8, (uint) strlen(koi8)); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -10601,15 +10601,15 @@ static void test_ps_i18n() /* this data must not be converted */ bind_array[0].buffer_type= MYSQL_TYPE_BLOB; bind_array[0].buffer= (void *) cp1251; - bind_array[0].buffer_length= strlen(cp1251); + bind_array[0].buffer_length= (uint) strlen(cp1251); bind_array[1].buffer_type= MYSQL_TYPE_BLOB; bind_array[1].buffer= (void *) cp1251; - bind_array[1].buffer_length= strlen(cp1251); + bind_array[1].buffer_length= (uint) strlen(cp1251); mysql_stmt_bind_param(stmt, bind_array); - mysql_stmt_send_long_data(stmt, 0, cp1251, strlen(cp1251)); + mysql_stmt_send_long_data(stmt, 0, cp1251, (uint) strlen(cp1251)); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -10619,7 +10619,7 @@ static void test_ps_i18n() stmt_text= "SELECT c1, c2 FROM t1"; /* c1 and c2 are binary so no conversion will be done on select */ - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -10646,10 +10646,10 @@ static void test_ps_i18n() mysql_stmt_close(stmt); stmt_text= "DROP TABLE t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "SET NAMES DEFAULT"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -10670,22 +10670,22 @@ static void test_bug3796() /* Create and fill test table */ stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE TABLE t1 (a INT, b VARCHAR(30))"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "INSERT INTO t1 VALUES(1, 'ONE'), (2, 'TWO')"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); /* Create statement handle and prepare it with select */ stmt= mysql_stmt_init(mysql); stmt_text= "SELECT concat(?, b) FROM t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); /* Bind input buffers */ @@ -10693,7 +10693,7 @@ static void test_bug3796() my_bind[0].buffer_type= MYSQL_TYPE_STRING; my_bind[0].buffer= (void *) concat_arg0; - my_bind[0].buffer_length= strlen(concat_arg0); + my_bind[0].buffer_length= (uint) strlen(concat_arg0); mysql_stmt_bind_param(stmt, my_bind); @@ -10730,7 +10730,7 @@ static void test_bug3796() mysql_stmt_close(stmt); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -10752,7 +10752,7 @@ static void test_bug4026() stmt= mysql_stmt_init(mysql); stmt_text= "SELECT ?, ?"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); /* Bind input buffers */ @@ -10830,7 +10830,7 @@ static void test_bug4079() stmt= mysql_stmt_init(mysql); stmt_text= "SELECT 1 < (SELECT a FROM t1)"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); /* Execute the select statement */ @@ -10869,7 +10869,7 @@ static void test_bug4236() /* mysql_stmt_execute() of statement with statement id= 0 crashed server */ stmt_text= "SELECT 1"; /* We need to prepare statement to pass by possible check in libmysql */ - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); /* Hack to check that server works OK if statement wasn't found */ backup.stmt_id= stmt->stmt_id; @@ -10901,7 +10901,7 @@ static void test_bug4030() stmt= mysql_stmt_init(mysql); stmt_text= "SELECT '23:59:59.123456', '2003-12-31', " "'2003-12-31 23:59:59.123456'"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -11012,7 +11012,7 @@ static void test_view() myquery(rc); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); strmov(str_data, "TEST"); @@ -11066,7 +11066,7 @@ static void test_view_where() myquery(rc); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); for (i= 0; i < 3; i++) @@ -11148,7 +11148,7 @@ static void test_view_2where() length[i] = 1; } stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_bind_param(stmt, my_bind); @@ -11199,7 +11199,7 @@ static void test_view_star() } stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_bind_param(stmt, my_bind); @@ -11247,11 +11247,11 @@ static void test_view_insert() myquery(rc); insert_stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(insert_stmt, query, strlen(query)); + rc= mysql_stmt_prepare(insert_stmt, query, (uint) strlen(query)); check_execute(insert_stmt, rc); query= "select * from t1"; select_stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(select_stmt, query, strlen(query)); + rc= mysql_stmt_prepare(select_stmt, query, (uint) strlen(query)); check_execute(select_stmt, rc); bzero((char*) my_bind, sizeof(my_bind)); @@ -11306,7 +11306,7 @@ static void test_left_join_view() rc= mysql_query(mysql,"create view v1 (x) as select a from t1 where a > 1"); myquery(rc); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); for (i= 0; i < 3; i++) @@ -11374,7 +11374,7 @@ static void test_view_insert_fields() my_bind[i].length= &l[i]; } stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_bind_param(stmt, my_bind); check_execute(stmt, rc); @@ -11385,7 +11385,7 @@ static void test_view_insert_fields() query= "select * from t1"; stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -11411,20 +11411,20 @@ static void test_bug5126() myheader("test_bug5126"); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE TABLE t1 (a mediumint, b int)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "INSERT INTO t1 VALUES (8386608, 1)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_stmt_init(mysql); stmt_text= "SELECT a, b FROM t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -11459,20 +11459,20 @@ static void test_bug4231() myheader("test_bug4231"); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE TABLE t1 (a int)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "INSERT INTO t1 VALUES (1)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_stmt_init(mysql); stmt_text= "SELECT a FROM t1 WHERE ? = ?"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); /* Bind input buffers */ @@ -11516,7 +11516,7 @@ static void test_bug4231() mysql_stmt_close(stmt); stmt_text= "DROP TABLE t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -11545,7 +11545,7 @@ static void test_bug5399() { sprintf(buff, "select %d", (int) (stmt - stmt_list)); *stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(*stmt, buff, strlen(buff)); + rc= mysql_stmt_prepare(*stmt, buff, (uint) strlen(buff)); check_execute(*stmt, rc); mysql_stmt_bind_result(*stmt, my_bind); } @@ -11622,7 +11622,7 @@ static void test_bug5194() myheader("test_bug5194"); stmt_text= "drop table if exists t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); stmt_text= "create table if not exists t1" "(c1 float, c2 float, c3 float, c4 float, c5 float, c6 float, " @@ -11667,7 +11667,7 @@ static void test_bug5194() "c235 float, c236 float, c237 float, c238 float, c239 float, c240 float, " "c241 float, c242 float, c243 float, c244 float, c245 float, c246 float, " "c247 float, c248 float, c249 float, c250 float)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); my_bind= (MYSQL_BIND*) malloc(MAX_PARAM_COUNT * sizeof(MYSQL_BIND)); @@ -11694,7 +11694,7 @@ static void test_bug5194() for (i= 1; i < COLUMN_COUNT; ++i) strcat(param_str, "?, "); strcat(param_str, "?)"); - param_str_length= strlen(param_str); + param_str_length= (uint) strlen(param_str); /* setup bind array */ bzero((char*) my_bind, MAX_PARAM_COUNT * sizeof(MYSQL_BIND)); @@ -11725,7 +11725,7 @@ static void test_bug5194() } *query_ptr= '\0'; - rc= mysql_stmt_prepare(stmt, query, query_ptr - query); + rc= mysql_stmt_prepare(stmt, query, (uint) (query_ptr - query)); if (rc && nrows * COLUMN_COUNT > uint16_max) { if (!opt_silent) @@ -11754,7 +11754,7 @@ static void test_bug5194() free(query); free(param_str); stmt_text= "drop table t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -11769,7 +11769,7 @@ static void test_bug5315() stmt_text= "SELECT 1"; stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); DIE_UNLESS(rc == 0); mysql_change_user(mysql, opt_user, opt_password, current_db); rc= mysql_stmt_execute(stmt); @@ -11782,7 +11782,7 @@ static void test_bug5315() /* check that connection is OK */ mysql_stmt_close(stmt); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); DIE_UNLESS(rc == 0); rc= mysql_stmt_execute(stmt); DIE_UNLESS(rc == 0); @@ -11805,13 +11805,13 @@ static void test_bug6049() stmt_text= "SELECT MAKETIME(-25, 12, 12)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); res= mysql_store_result(mysql); row= mysql_fetch_row(res); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -11854,13 +11854,13 @@ static void test_bug6058() stmt_text= "SELECT CAST('0000-00-00' AS DATE)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); res= mysql_store_result(mysql); row= mysql_fetch_row(res); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -11898,7 +11898,7 @@ static void test_bug6059() stmt_text= "SELECT 'foo' INTO OUTFILE 'x.3'"; stmt= mysql_stmt_init(mysql); - (void) mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + (void) mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); DIE_UNLESS(mysql_stmt_field_count(stmt) == 0); mysql_stmt_close(stmt); } @@ -11915,13 +11915,13 @@ static void test_bug6046() myheader("test_bug6046"); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE TABLE t1 (a int, b int)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "INSERT INTO t1 VALUES (1,1),(2,2),(3,1),(4,2)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_stmt_init(mysql); @@ -11929,7 +11929,7 @@ static void test_bug6046() stmt_text= "SELECT t1.a FROM t1 NATURAL JOIN t1 as X1 " "WHERE t1.b > ? ORDER BY t1.a"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); b= 1; @@ -12065,7 +12065,7 @@ static void test_bug6096() myheader("test_bug6096"); stmt_text= "drop table if exists t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); mysql_query(mysql, "set sql_mode=''"); @@ -12075,24 +12075,24 @@ static void test_bug6096() " c_double double, c_varchar varchar(20), " " c_char char(20), c_time time, c_date date, " " c_datetime datetime)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "insert into t1 values (-100, -20000, 30000000, 4, 8, 1.0, " "2.0, 'abc', 'def', now(), now(), now())"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "select * from t1"; /* Run select in prepared and non-prepared mode and compare metadata */ - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); query_result= mysql_store_result(mysql); query_field_list= mysql_fetch_fields(query_result); query_field_count= mysql_num_fields(query_result); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -12149,7 +12149,7 @@ static void test_bug6096() mysql_free_result(query_result); mysql_free_result(stmt_metadata); stmt_text= "drop table t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -12170,12 +12170,12 @@ static void test_datetime_ranges() myheader("test_datetime_ranges"); stmt_text= "drop table if exists t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "create table t1 (year datetime, month datetime, day datetime, " "hour datetime, min datetime, sec datetime)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_simple_prepare(mysql, @@ -12214,7 +12214,7 @@ static void test_datetime_ranges() mysql_stmt_close(stmt); stmt_text= "delete from t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_simple_prepare(mysql, "INSERT INTO t1 (year, month, day) " @@ -12242,11 +12242,11 @@ static void test_datetime_ranges() mysql_stmt_close(stmt); stmt_text= "drop table t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "create table t1 (day_ovfl time, day time, hour time, min time, sec time)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_simple_prepare(mysql, @@ -12283,7 +12283,7 @@ static void test_datetime_ranges() mysql_stmt_close(stmt); stmt_text= "drop table t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -12309,7 +12309,7 @@ static void test_bug4172() stmt= mysql_stmt_init(mysql); stmt_text= "SELECT f, d, e FROM t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -12334,7 +12334,7 @@ static void test_bug4172() rc= mysql_stmt_fetch(stmt); check_execute(stmt, rc); - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); res= mysql_store_result(mysql); row= mysql_fetch_row(res); @@ -12365,20 +12365,20 @@ static void test_conversion() myheader("test_conversion"); stmt_text= "DROP TABLE IF EXISTS t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE TABLE t1 (a TEXT) DEFAULT CHARSET latin1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "SET character_set_connection=utf8, character_set_client=utf8, " " character_set_results=latin1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_stmt_init(mysql); stmt_text= "INSERT INTO t1 (a) VALUES (?)"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); bzero((char*) my_bind, sizeof(my_bind)); @@ -12396,7 +12396,7 @@ static void test_conversion() check_execute(stmt, rc); stmt_text= "SELECT a FROM t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -12413,10 +12413,10 @@ static void test_conversion() mysql_stmt_close(stmt); stmt_text= "DROP TABLE t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "SET NAMES DEFAULT"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -12432,16 +12432,16 @@ static void test_rewind(void) myheader("test_rewind"); stmt_text= "CREATE TABLE t1 (a int)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "INSERT INTO t1 VALUES(2),(3),(4)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt= mysql_stmt_init(mysql); stmt_text= "SELECT * FROM t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); bzero((char*) &my_bind, sizeof(MYSQL_BIND)); @@ -12476,7 +12476,7 @@ static void test_rewind(void) DIE_UNLESS(rc == MYSQL_NO_DATA); stmt_text= "DROP TABLE t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); rc= mysql_stmt_free_result(stmt); rc= mysql_stmt_close(stmt); @@ -12504,7 +12504,7 @@ static void test_truncation() "d double, d_1 double, ch char(30), ch_1 char(30), " "tx text, tx_1 text, ch_2 char(30) " ")"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "insert into t1 VALUES (" "-10, " /* i8 */ @@ -12522,7 +12522,7 @@ static void test_truncation() "'12345.67 ', " /* tx_1 */ "'12345.67abc'" /* ch_2 */ ")"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "select i8 c1, i8 c2, ui8 c3, i16_1 c4, ui16 c5, " @@ -12532,7 +12532,7 @@ static void test_truncation() "from t1"; stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -12740,7 +12740,7 @@ static void test_truncation_option() stmt_text= "select -1"; stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -12786,7 +12786,7 @@ static void test_bug6761(void) myheader("test_bug6761"); stmt_text= "CREATE TABLE t1 (a int, b char(255), c decimal)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); res= mysql_list_fields(mysql, "t1", "%"); @@ -12794,7 +12794,7 @@ static void test_bug6761(void) mysql_free_result(res); stmt_text= "DROP TABLE t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -12814,17 +12814,17 @@ static void test_bug8330() stmt_text= "drop table if exists t1"; /* in case some previos test failed */ - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "create table t1 (a int, b int)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); bzero((char*) my_bind, sizeof(my_bind)); for (i=0; i < 2; i++) { stmt[i]= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt[i], query, strlen(query)); + rc= mysql_stmt_prepare(stmt[i], query, (uint) strlen(query)); check_execute(stmt[i], rc); my_bind[i].buffer_type= MYSQL_TYPE_LONG; @@ -12845,7 +12845,7 @@ static void test_bug8330() mysql_stmt_close(stmt[1]); stmt_text= "drop table t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -13030,7 +13030,7 @@ static void test_bug8378() sprintf(buf, "SELECT '%s'", out); - rc=mysql_real_query(lmysql, buf, strlen(buf)); + rc=mysql_real_query(lmysql, buf, (uint) strlen(buf)); myquery(rc); mysql_close(lmysql); @@ -13047,19 +13047,19 @@ static void test_bug8722() myheader("test_bug8722"); /* Prepare test data */ stmt_text= "drop table if exists t1, v1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE TABLE t1 (c1 varchar(10), c2 varchar(10), c3 varchar(10)," " c4 varchar(10), c5 varchar(10), c6 varchar(10)," " c7 varchar(10), c8 varchar(10), c9 varchar(10)," "c10 varchar(10))"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "CREATE VIEW v1 AS SELECT * FROM t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); /* Note: if you uncomment following block everything works fine */ /* @@ -13070,11 +13070,11 @@ static void test_bug8722() stmt= mysql_stmt_init(mysql); stmt_text= "select * from v1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); mysql_stmt_close(stmt); stmt_text= "drop table if exists t1, v1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); } @@ -13085,7 +13085,7 @@ MYSQL_STMT *open_cursor(const char *quer const ulong type= (ulong)CURSOR_TYPE_READ_ONLY; MYSQL_STMT *stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*) &type); @@ -13136,7 +13136,7 @@ static void test_bug9159() myquery(rc); stmt= mysql_stmt_init(mysql); - mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void *)&type); mysql_stmt_execute(stmt); @@ -13378,7 +13378,7 @@ static void test_bug9643() (void*) &prefetch_rows); check_execute(stmt, rc); stmt_text= "select * from t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); bzero((char*) my_bind, sizeof(my_bind)); @@ -13434,7 +13434,7 @@ static void test_bug11111() stmt= mysql_stmt_init(mysql); - mysql_stmt_prepare(stmt, query, strlen(query)); + mysql_stmt_prepare(stmt, query, (uint) strlen(query)); mysql_stmt_execute(stmt); bzero((char*) my_bind, sizeof(my_bind)); @@ -13492,7 +13492,7 @@ static void test_bug10729() rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*) &type); check_execute(stmt, rc); stmt_text= "select name from t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); bzero((char*) my_bind, sizeof(my_bind)); @@ -13602,7 +13602,7 @@ static void test_bug10736() rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*) &type); check_execute(stmt, rc); stmt_text= "select name from t1 where name=(select name from t1 where id=2)"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); bzero((char*) my_bind, sizeof(my_bind)); @@ -13652,7 +13652,7 @@ static void test_bug10794() "name varchar(20) not null)"); stmt= mysql_stmt_init(mysql); stmt_text= "insert into t1 (id, name) values (?, ?)"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); bzero((char*) my_bind, sizeof(my_bind)); my_bind[0].buffer_type= MYSQL_TYPE_LONG; @@ -13666,12 +13666,12 @@ static void test_bug10794() { id_val= (i+1)*10; sprintf(a, "a%d", i); - a_len= strlen(a); /* safety against broken sprintf */ + a_len= (uint) strlen(a); /* safety against broken sprintf */ rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); } stmt_text= "select name from t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); type= (ulong) CURSOR_TYPE_READ_ONLY; mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type); stmt1= mysql_stmt_init(mysql); @@ -13693,7 +13693,7 @@ static void test_bug10794() mysql_stmt_free_result(stmt); mysql_stmt_reset(stmt); stmt_text= "select name from t1 where id=10"; - rc= mysql_stmt_prepare(stmt1, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt1, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt1, rc); rc= mysql_stmt_bind_result(stmt1, my_bind); check_execute(stmt1, rc); @@ -13743,7 +13743,7 @@ static void test_bug11172() myquery(rc); stmt= mysql_stmt_init(mysql); stmt_text= "SELECT id, hired FROM t1 WHERE hired=?"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); type= (ulong) CURSOR_TYPE_READ_ONLY; @@ -13815,7 +13815,7 @@ static void test_bug11656() stmt_text= "select distinct test_kind, test_id from t1 " "where server in (?, ?)"; stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); type= (ulong) CURSOR_TYPE_READ_ONLY; mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type); @@ -13827,7 +13827,7 @@ static void test_bug11656() { my_bind[i].buffer_type= MYSQL_TYPE_STRING; my_bind[i].buffer= (gptr *)&buf[i]; - my_bind[i].buffer_length= strlen(buf[i]); + my_bind[i].buffer_length= (uint) strlen(buf[i]); } mysql_stmt_bind_param(stmt, my_bind); @@ -13932,7 +13932,7 @@ static void test_bug11183() stmt= mysql_stmt_init(mysql); DIE_UNLESS(stmt != 0); - rc= mysql_stmt_prepare(stmt, bug_statement, strlen(bug_statement)); + rc= mysql_stmt_prepare(stmt, bug_statement, (uint) strlen(bug_statement)); check_execute(stmt, rc); rc= mysql_query(mysql, "drop table t1"); @@ -13978,7 +13978,7 @@ static void test_bug11037() stmt_text= "select id FROM t1"; stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); /* expected error */ rc = mysql_stmt_fetch(stmt); @@ -14046,7 +14046,7 @@ static void test_bug10760() con1: insert into t1 (id) values (1) */ stmt_text= "select id from t1 order by 1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); @@ -14079,7 +14079,7 @@ static void test_bug10760() else { stmt_text= "select id from t1 order by 1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_query(mysql, "alter table t1 engine=InnoDB"); @@ -14182,7 +14182,7 @@ static void test_bug11909() myheader("test_bug11909"); stmt_text= "drop table if exists t1"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "create table t1 (" @@ -14191,7 +14191,7 @@ static void test_bug11909() " workdept varchar(6) not null, salary double not null," " bonus float not null, primary key (empno)" ") default charset=latin1 collate=latin1_bin"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "insert into t1 values " @@ -14200,7 +14200,7 @@ static void test_bug11909() "(30, 'SALLY', 'A', 'KWAN', 'C01', 38250, 800)," "(50, 'JOHN', 'B', 'GEYER', 'E01', 40175, 800), " "(60, 'IRVING', 'F', 'STERN', 'D11', 32250, 500)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); /* ****** Begin of trace ****** */ @@ -14298,7 +14298,7 @@ static void test_bug11901() myheader("test_bug11901"); stmt_text= "drop table if exists t1, t2"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "create table t1 (" @@ -14308,7 +14308,7 @@ static void test_bug11901() " bonus float not null, primary key (empno), " " unique key (workdept, empno) " ") default charset=latin1 collate=latin1_bin"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "insert into t1 values " @@ -14345,7 +14345,7 @@ static void test_bug11901() "(330, 'WING', '', 'LEE', 'E21', 25370, 500), " "(340, 'JASON', 'R', 'GOUNOT', 'E21', 23840, 500)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "create table t2 (" @@ -14354,7 +14354,7 @@ static void test_bug11901() " admrdept varchar(6) not null, refcntd int(11) not null," " refcntu int(11) not null, primary key (deptno)" ") default charset=latin1 collate=latin1_bin"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); stmt_text= "insert into t2 values " @@ -14367,7 +14367,7 @@ static void test_bug11901() "('E01', 'SUPPORT SERVICES', 50, '', 'A00', 0, 0), " "('E11', 'OPERATIONS', 90, '', 'E01', 0, 0), " "('E21', 'SOFTWARE SUPPORT', 100,'', 'E01', 0, 0)"; - rc= mysql_real_query(mysql, stmt_text, strlen(stmt_text)); + rc= mysql_real_query(mysql, stmt_text, (uint) strlen(stmt_text)); myquery(rc); /* ****** Begin of trace ****** */ @@ -14437,7 +14437,7 @@ static void test_bug11904() stmt_text= "SELECT id, MIN(name) FROM bug11904b GROUP BY id"; - rc= mysql_stmt_prepare(stmt1, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt1, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt1, rc); memset(my_bind, 0, sizeof(my_bind)); @@ -14513,14 +14513,14 @@ static void test_bug12243() stmt_text= "select a from t1"; - rc= mysql_stmt_prepare(stmt1, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt1, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt1, rc); rc= mysql_stmt_execute(stmt1); check_execute(stmt1, rc); rc= mysql_stmt_fetch(stmt1); check_execute(stmt1, rc); - rc= mysql_stmt_prepare(stmt2, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt2, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt2, rc); rc= mysql_stmt_execute(stmt2); check_execute(stmt2, rc); @@ -14626,7 +14626,7 @@ static void test_bug14210() stmt_text= "select a from t1"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); while ((rc= mysql_stmt_fetch(stmt)) == 0) @@ -14680,7 +14680,7 @@ static void test_bug13488() rc= mysql_stmt_attr_set(stmt1,STMT_ATTR_CURSOR_TYPE, (const void *)&type); check_execute(stmt1, rc); - rc= mysql_stmt_prepare(stmt1, query, strlen(query)); + rc= mysql_stmt_prepare(stmt1, query, (uint) strlen(query)); check_execute(stmt1, rc); rc= mysql_stmt_execute(stmt1); @@ -14735,7 +14735,7 @@ static void test_bug13524() rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type); check_execute(stmt, rc); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -14794,7 +14794,7 @@ static void test_bug14845() rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type); check_execute(stmt, rc); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -14830,7 +14830,7 @@ static void test_bug15510() stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -15002,7 +15002,7 @@ static void test_bug15613() /* II. Check SELECT metadata */ stmt_text= ("select t, tt, mt, lt, vl, vb, vu from t1"); - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); metadata= mysql_stmt_result_metadata(stmt); field= mysql_fetch_fields(metadata); if (!opt_silent) @@ -15196,7 +15196,7 @@ static void test_bug14169() myquery(rc); stmt= mysql_stmt_init(mysql); stmt_text= "select f2,group_concat(f1) from t1 group by f2"; - rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + rc= mysql_stmt_prepare(stmt, stmt_text, (uint) strlen(stmt_text)); myquery(rc); res= mysql_stmt_result_metadata(stmt); field= mysql_fetch_fields(res); @@ -15439,7 +15439,7 @@ static void test_bug20152() myquery(rc); stmt= mysql_stmt_init(mysql); - rc= mysql_stmt_prepare(stmt, query, strlen(query)); + rc= mysql_stmt_prepare(stmt, query, (uint) strlen(query)); check_execute(stmt, rc); rc= mysql_stmt_bind_param(stmt, my_bind); check_execute(stmt, rc); @@ -15484,11 +15484,11 @@ static void test_bug15752() printf("Unable connect to MySQL server: %s\n", mysql_error(&mysql_local)); DIE_UNLESS(0); } - rc= mysql_real_query(&mysql_local, query, strlen(query)); + rc= mysql_real_query(&mysql_local, query, (uint) strlen(query)); myquery(rc); mysql_free_result(mysql_store_result(&mysql_local)); - rc= mysql_real_query(&mysql_local, query, strlen(query)); + rc= mysql_real_query(&mysql_local, query, (uint) strlen(query)); DIE_UNLESS(rc && mysql_errno(&mysql_local) == CR_COMMANDS_OUT_OF_SYNC); if (! opt_silent) @@ -15503,7 +15503,7 @@ static void test_bug15752() /* The second problem is not reproducible: add the test case */ for (i = 0; i < ITERATION_COUNT; i++) { - if (mysql_real_query(&mysql_local, query, strlen(query))) + if (mysql_real_query(&mysql_local, query, (uint) strlen(query))) { printf("\ni=%d %s failed: %s\n", i, query, mysql_error(&mysql_local)); break; @@ -15550,7 +15550,7 @@ static void test_bug21206() for (fetch= fetch_array; fetch < fetch_array + cursor_count; ++fetch) { /* Init will exit(1) in case of error */ - stmt_fetch_init(fetch, fetch - fetch_array, query); + stmt_fetch_init(fetch, (uint) (fetch - fetch_array), query); } for (fetch= fetch_array; fetch < fetch_array + cursor_count; ++fetch) @@ -15645,7 +15645,7 @@ static void test_bug23383() stmt= mysql_stmt_init(mysql); DIE_UNLESS(stmt != 0); - rc= mysql_stmt_prepare(stmt, insert_query, strlen(insert_query)); + rc= mysql_stmt_prepare(stmt, insert_query, (uint) strlen(insert_query)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -15658,7 +15658,7 @@ static void test_bug23383() row_count= mysql_stmt_affected_rows(stmt); DIE_UNLESS(row_count == (my_ulonglong)-1); - rc= mysql_stmt_prepare(stmt, update_query, strlen(update_query)); + rc= mysql_stmt_prepare(stmt, update_query, (uint) strlen(update_query)); check_execute(stmt, rc); rc= mysql_stmt_execute(stmt); @@ -15724,7 +15724,7 @@ static void test_bug21635() rc= mysql_query(mysql, "INSERT INTO t1 VALUES (1)"); myquery(rc); - rc= mysql_real_query(mysql, query, query_end - query); + rc= mysql_real_query(mysql, query, (uint) (query_end - query)); myquery(rc); result= mysql_use_result(mysql); diff -Nrup a/vio/viosocket.c b/vio/viosocket.c --- a/vio/viosocket.c 2007-05-24 05:21:24 -04:00 +++ b/vio/viosocket.c 2008-04-09 12:43:37 -04:00 @@ -67,7 +67,7 @@ int vio_read_buff(Vio *vio, gptr buf, in if (vio->read_pos < vio->read_end) { - rc= min(vio->read_end - vio->read_pos, size); + rc= min((int) (vio->read_end - vio->read_pos), size); memcpy(buf, vio->read_pos, rc); vio->read_pos+= rc; /*
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (iggy:1.2613) BUG#29125 | Ignacio Galarza | 9 Apr |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 2.246 sec. using MySQL 5.1.14-beta-log