From 5275eb21c25eef0c5b799315da10f26b779fbfe9 Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com>
Date: Fri, 11 Jun 2004 16:29:16 +0500
Subject: Allocate memory when a character set is requested: - For simple
 character sets: from_uni convertion table. - For UCA: alternative weight
 arrays. Use mbminlen instead of MY_CS_NONTEXT

---
 sql/sql_string.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_string.cc')

diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index f7e4e436495..cf4f94ba966 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -370,7 +370,7 @@ bool String::copy(const char *str, uint32 arg_length,
 
 bool String::set_ascii(const char *str, uint32 arg_length)
 {
-  if (!(str_charset->state & MY_CS_NONTEXT))
+  if (!(str_charset->mbminlen > 1))
   {
     set(str, arg_length, str_charset);
     return 0;
-- 
cgit v1.2.1