summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
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 6077c42bd1d..cf6645fa23e 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -265,9 +265,9 @@ bool String::copy(const char *str, uint32 arg_length,
*/
-bool String::set_latin1(const char *str, uint32 arg_length)
+bool String::set_ascii(const char *str, uint32 arg_length)
{
- if (str_charset->mbmaxlen == 1)
+ if (!(str_charset->state & MY_CS_NONTEXT))
{
set(str, arg_length, str_charset);
return 0;