diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-03-28 17:19:09 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-03-28 17:19:09 +0400 |
| commit | d1e162e011d77e64cc98afa76ed5e67b2bca6381 (patch) | |
| tree | 55335bb289b5712e4bf1589bc9cc10313918d23a /mysys/charset-def.c | |
| parent | 41013f16a05f45524a01e40cc48bc8e6f9904f55 (diff) | |
| download | mariadb-git-d1e162e011d77e64cc98afa76ed5e67b2bca6381.tar.gz | |
Merging utf16le from MySQL-5.6
added:
mysql-test/include/ctype_heap.inc
mysql-test/include/ctype_strtoll10.inc
mysql-test/r/ctype_utf16le.result
mysql-test/t/ctype_utf16le.test
modified:
cmake/character_sets.cmake
include/m_ctype.h
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf32.result
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/sys_vars/r/character_set_client_basic.result
mysql-test/suite/sys_vars/r/character_set_connection_basic.result
mysql-test/suite/sys_vars/r/character_set_database_basic.result
mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
mysql-test/suite/sys_vars/r/character_set_results_basic.result
mysql-test/t/ctype_ucs.test
mysql-test/t/ctype_utf16.test
mysql-test/t/ctype_utf32.test
mysys/charset-def.c
sql/item_func.cc
sql/sys_vars.cc
strings/ctype-latin1.c
strings/ctype-ucs2.c
Diffstat (limited to 'mysys/charset-def.c')
| -rw-r--r-- | mysys/charset-def.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index e9f2ecdea49..cb384ad20fa 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -304,6 +304,8 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) #ifdef HAVE_CHARSET_utf16 add_compiled_collation(&my_charset_utf16_general_ci); add_compiled_collation(&my_charset_utf16_bin); + add_compiled_collation(&my_charset_utf16le_general_ci); + add_compiled_collation(&my_charset_utf16le_bin); #ifdef HAVE_UCA_COLLATIONS add_compiled_collation(&my_charset_utf16_unicode_ci); add_compiled_collation(&my_charset_utf16_icelandic_uca_ci); |