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 /cmake/character_sets.cmake | |
| 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 'cmake/character_sets.cmake')
| -rw-r--r-- | cmake/character_sets.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/character_sets.cmake b/cmake/character_sets.cmake index 74a39e09cac..1c93441cbb1 100644 --- a/cmake/character_sets.cmake +++ b/cmake/character_sets.cmake @@ -25,14 +25,14 @@ ENDIF() SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8 utf8mb4) SET(CHARSETS_COMPLEX big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 - sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) + sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf16le utf32) SET(CHARSETS_AVAILABLE binary armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257 cp850 cp852 cp866 cp932 dec8 eucjpms euckr gb2312 gbk geostd8 greek hebrew hp8 keybcs2 koi8r koi8u latin1 latin2 latin5 latin7 macce macroman -sjis swe7 tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) +sjis swe7 tis620 ucs2 ujis utf8 utf8mb4 utf16 utf16le utf32) SET (EXTRA_CHARSETS "all") |