summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-09-19 15:19:15 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-09-19 15:19:15 +0500
commit127d402ef8348594a9dbaba9ddb1c06dfc0c3d37 (patch)
tree2e7cb9ed7fb38a5fa1f7a8f0fc049712415c443b /mysys
parent2d46389ac88d4aad575f7210891c52d701bc8f16 (diff)
parent44bffa0b0564a0d28558202d6cebbbea5eee1729 (diff)
downloadmariadb-git-127d402ef8348594a9dbaba9ddb1c06dfc0c3d37.tar.gz
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1 sql/item_func.cc: Auto merged
Diffstat (limited to 'mysys')
-rw-r--r--mysys/charset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c
index 58ce8f5b2fe..e8406173b33 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -119,7 +119,7 @@ static void simple_cs_init_functions(CHARSET_INFO *cs)
if (cs->state & MY_CS_BINSORT)
{
- cs->coll= &my_collation_bin_handler;
+ cs->coll= &my_collation_8bit_bin_handler;
}
else
{