summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
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
commit82df8cf36ee1ec818780b28e875b7fbbcfb64fc2 (patch)
tree85b39362efeae16536a90f3a3624acd6916d4305 /sql/sql_string.cc
parentf1f5d7d754c1e9b52fac38164aa62c380001aeb8 (diff)
parentfbc16e58034eb0306a9f123a690af015c1e1baca (diff)
downloadmariadb-git-82df8cf36ee1ec818780b28e875b7fbbcfb64fc2.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/sql_string.cc')
-rw-r--r--sql/sql_string.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 34b310931d6..9024f98bd92 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -458,7 +458,7 @@ bool String::append(const char *s,uint32 arg_length)
bool String::append(const char *s)
{
- return append(s, strlen(s));
+ return append(s, (uint) strlen(s));
}
@@ -1051,7 +1051,7 @@ outp:
}
}
*from_end_pos= from;
- res= to - to_start;
+ res= (uint) (to - to_start);
}
return (uint32) res;
}