summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 9a9fff8522c..1310819d2e3 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -466,8 +466,8 @@ public:
}
bool append(const String &s);
bool append(const char *s);
- bool append(const LEX_STRING *ls) { return append(ls->str, ls->length); }
- bool append(const LEX_CSTRING *ls) { return append(ls->str, ls->length); }
+ bool append(const LEX_STRING *ls) { return append(ls->str, (uint32)ls->length); }
+ bool append(const LEX_CSTRING *ls) { return append(ls->str, (uint32)ls->length); }
bool append(const char *s, uint32 arg_length);
bool append(const char *s, uint32 arg_length, CHARSET_INFO *cs);
bool append_ulonglong(ulonglong val);
@@ -634,7 +634,7 @@ public:
}
bool append_for_single_quote(const char *st)
{
- return append_for_single_quote(st, strlen(st));
+ return append_for_single_quote(st, (uint)strlen(st));
}
/* Swap two string objects. Efficient way to exchange data without memcpy. */