summaryrefslogtreecommitdiff
path: root/sql-common
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 /sql-common
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 'sql-common')
-rw-r--r--sql-common/client.c2
-rw-r--r--sql-common/my_user.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 63c746a3f5a..b63ba33bfb8 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -3183,7 +3183,7 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
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 --git a/sql-common/my_user.c b/sql-common/my_user.c
index d6f2818ad77..0b72e002977 100644
--- a/sql-common/my_user.c
+++ b/sql-common/my_user.c
@@ -44,8 +44,8 @@ void parse_user(const char *user_id_str, size_t user_id_len,
}
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);
if (*user_name_len > USERNAME_LENGTH)
*user_name_len= USERNAME_LENGTH;