summaryrefslogtreecommitdiff
path: root/mysys/charset.c
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2016-09-03 09:05:56 +0400
committerAlexander Barkov <bar@mariadb.org>2016-09-03 09:05:56 +0400
commit1ca595fbf7d186bbe9f2f9896869b316d6e9567a (patch)
treeb6751102168660d7eaf923b001cb21d40975603b /mysys/charset.c
parentaddb38f4763faa0378cd369106372a0eb0f0ee75 (diff)
downloadmariadb-git-1ca595fbf7d186bbe9f2f9896869b316d6e9567a.tar.gz
LDML refactoring for "MDEV-9711 NO PAD collations"
- Moving detection of the MY_CS_CSSORT, MY_CS_PUREASCII, MY_CS_NONASCII flags of loadable collations from add_collation() in mysys.c to my_cset_init_8bit() and my_coll_init_simple() in ctype-simple.c. - Adding tests that these flags are set properly for loadable collations - Moving LDML test related *.xml files from mysql-test/std_data/ to mysql-test/std_data/ldml/, as there will be more *.xml test files
Diffstat (limited to 'mysys/charset.c')
-rw-r--r--mysys/charset.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/mysys/charset.c b/mysys/charset.c
index e46fd16a5fb..2a96ec0070d 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -297,7 +297,6 @@ static int add_collation(struct charset_info_st *cs)
}
else
{
- const uchar *sort_order= newcs->sort_order;
simple_cs_init_functions(newcs);
newcs->mbminlen= 1;
newcs->mbmaxlen= 1;
@@ -307,21 +306,6 @@ static int add_collation(struct charset_info_st *cs)
newcs->state |= MY_CS_LOADED;
}
newcs->state|= MY_CS_AVAILABLE;
-
- /*
- Check if case sensitive sort order: A < a < B.
- We need MY_CS_FLAG for regex library, and for
- case sensitivity flag for 5.0 client protocol,
- to support isCaseSensitive() method in JDBC driver
- */
- if (sort_order && sort_order['A'] < sort_order['a'] &&
- sort_order['a'] < sort_order['B'])
- newcs->state|= MY_CS_CSSORT;
-
- if (my_charset_is_8bit_pure_ascii(newcs))
- newcs->state|= MY_CS_PUREASCII;
- if (!my_charset_is_ascii_compatible(cs))
- newcs->state|= MY_CS_NONASCII;
}
}
else