summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
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
commit54fbbf9591e21cda9f7b26c2d795d88f51827f07 (patch)
tree6d7f0073845344099159d82b6dfe2e017670b700 /sql/protocol.cc
parent4568152518d075ec543bcc55b77241e4a5bf7c17 (diff)
downloadmariadb-git-54fbbf9591e21cda9f7b26c2d795d88f51827f07.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/protocol.cc')
-rw-r--r--sql/protocol.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc
index ff58d96f59b..996ede5d6a2 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -306,7 +306,7 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
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, CHARSET_INFO *cs)
{
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);
}