summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-06 17:20:27 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-06 17:20:27 +0300
commit7cd11f45beeb162db84dea423a040a296ac2856e (patch)
tree3fcae3d99a56ba99d825ae4457901d49e4b474e3 /strings
parent5462a6dbcc68d51a89356255fb4f398be7d62c27 (diff)
parent3e2c9aac11a95d8cbb61e1937e4ebe18c7e86698 (diff)
downloadmariadb-git-7cd11f45beeb162db84dea423a040a296ac2856e.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-uca.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index ecf92c1b7d4..541eb7afeb9 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -7886,6 +7886,9 @@ static my_bool create_tailoring(CHARSET_INFO *cs, void *(*alloc)(size_t))
return 1;
}
+ if (!cs->caseinfo)
+ cs->caseinfo= my_unicase_default;
+
if (!(newweights= (uint16**) (*alloc)(256*sizeof(uint16*))))
return 1;
bzero(newweights, 256*sizeof(uint16*));