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 /mysql-test/suite/sys_vars/r/character_set_client_basic.result | |
| 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 'mysql-test/suite/sys_vars/r/character_set_client_basic.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/character_set_client_basic.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/character_set_client_basic.result b/mysql-test/suite/sys_vars/r/character_set_client_basic.result index b0b8d620a9e..e6502d63c78 100644 --- a/mysql-test/suite/sys_vars/r/character_set_client_basic.result +++ b/mysql-test/suite/sys_vars/r/character_set_client_basic.result @@ -430,7 +430,7 @@ ERROR 42000: Unknown character set: '100' SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS); SELECT @total_charset; @total_charset -39 +40 '#--------------------FN_DYNVARS_010_10-------------------------#' SET @@character_set_client = abc; ERROR 42000: Unknown character set: 'abc' |