summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-02-10 17:47:54 -0500
committerIgnacio Galarza <iggy@mysql.com>2009-02-10 17:47:54 -0500
commit2b85c64d65385297f4a90265ae47cb298891dd5f (patch)
tree6d7f0073845344099159d82b6dfe2e017670b700 /sql-common
parent1a7b0ec920bb496019dbbddfabd463f498af34c6 (diff)
downloadmariadb-git-2b85c64d65385297f4a90265ae47cb298891dd5f.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 519deac2bc5..27cc110401c 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -3145,7 +3145,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 fa5b80413bf..8d54275b2fd 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, uint 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);
memcpy(user_name_str, user_id_str, *user_name_len);
memcpy(host_name_str, p + 1, *host_name_len);