summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authorbar@mysql.com <>2004-06-11 16:29:16 +0500
committerbar@mysql.com <>2004-06-11 16:29:16 +0500
commitc64d93b27403dc9d154eb601b88d95964f9fc05b (patch)
tree72245220b637b8d5caf3b8267ea6801af59f0bc7 /sql/item_create.cc
parent21c524e712875f8b66ad95c76da1d4305d0538d8 (diff)
downloadmariadb-git-c64d93b27403dc9d154eb601b88d95964f9fc05b.tar.gz
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
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 74f36de11ac..53d4f14d1ee 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -373,7 +373,7 @@ Item *create_func_space(Item *a)
CHARSET_INFO *cs= current_thd->variables.collation_connection;
Item *sp;
- if (cs->state & MY_CS_NONTEXT)
+ if (cs->mbminlen > 1)
{
sp= new Item_string("",0,cs);
if (sp)