summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-02-13 11:41:47 -0500
committerIgnacio Galarza <iggy@mysql.com>2009-02-13 11:41:47 -0500
commit2d9421c3bb7376bcfa5484d94b45df65d67e4468 (patch)
tree85b39362efeae16536a90f3a3624acd6916d4305 /libmysql
parentbf63b815faa9b6dd14253b28aabaf48ba178fe5a (diff)
parent2b85c64d65385297f4a90265ae47cb298891dd5f (diff)
downloadmariadb-git-2d9421c3bb7376bcfa5484d94b45df65d67e4468.tar.gz
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. - Strings are guaranteed to be max uint in length
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index ca329eadf0f..1dd32df7aff 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1617,7 +1617,7 @@ mysql_hex_string(char *to, const char *from, ulong length)
ulong STDCALL
mysql_escape_string(char *to,const char *from,ulong length)
{
- return escape_string_for_mysql(default_charset_info, to, 0, from, length);
+ return (uint) escape_string_for_mysql(default_charset_info, to, 0, from, length);
}
ulong STDCALL
@@ -1625,8 +1625,8 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from,
ulong length)
{
if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)
- return escape_quotes_for_mysql(mysql->charset, to, 0, from, length);
- return escape_string_for_mysql(mysql->charset, to, 0, from, length);
+ return (uint) escape_quotes_for_mysql(mysql->charset, to, 0, from, length);
+ return (uint) escape_string_for_mysql(mysql->charset, to, 0, from, length);
}
void STDCALL