mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
Merge mysql.com:/home/ram/work/b31615/b31615.5.0
into mysql.com:/home/ram/work/b31615/b31615.5.1
This commit is contained in:
commit
a24102a099
2 changed files with 20 additions and 0 deletions
|
@ -811,6 +811,14 @@ quote(name)
|
|||
????????
|
||||
????????????????
|
||||
drop table bug20536;
|
||||
set names ucs2;
|
||||
ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'
|
||||
set names ucs2 collate ucs2_bin;
|
||||
ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'
|
||||
set character_set_client= ucs2;
|
||||
ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'
|
||||
set character_set_client= concat('ucs', substr('2', 1));
|
||||
ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'
|
||||
End of 4.1 tests
|
||||
CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));
|
||||
INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);
|
||||
|
|
|
@ -547,6 +547,18 @@ select quote(name) from bug20536;
|
|||
|
||||
drop table bug20536;
|
||||
|
||||
#
|
||||
# Bug #31615: crash after set names ucs2 collate xxx
|
||||
#
|
||||
--error 1231
|
||||
set names ucs2;
|
||||
--error 1231
|
||||
set names ucs2 collate ucs2_bin;
|
||||
--error 1231
|
||||
set character_set_client= ucs2;
|
||||
--error 1231
|
||||
set character_set_client= concat('ucs', substr('2', 1));
|
||||
|
||||
--echo End of 4.1 tests
|
||||
|
||||
#
|
||||
|
|
Loading…
Add table
Reference in a new issue