database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source 
Conflicts:

Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in sql/item_func.cc
This commit is contained in:
Alexey Kopytov
2010-03-22 16:28:51 +03:00
parent 5d407d0c1a a35418784b
commit 074583a730
20 changed files with 260 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/charset.c
View File

@@ -245,6 +245,8 @@ static int add_collation(CHARSET_INFO *cs)
if (cs_copy_data(all_charsets[cs->number],cs))
return MY_XML_ERROR;
newcs->caseup_multiply= newcs->casedn_multiply= 1;
if (!strcmp(cs->csname,"ucs2") )
{
#if defined(HAVE_CHARSET_ucs2) && defined(HAVE_UCA_COLLATIONS)