diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-24 21:56:32 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-10-24 21:56:32 +0500 |
| commit | 59729a7835e168eab35495a50d3f6120eca5383a (patch) | |
| tree | dd8b891ae792fe5db58d11cf933eb03186fa0483 /mysql-test | |
| parent | 17e9db8cdbb787b9a1798e05e9ec520067491d90 (diff) | |
| parent | b5d33614ac8f41ad31557c778726ba753674a58e (diff) | |
| download | mariadb-git-59729a7835e168eab35495a50d3f6120eca5383a.tar.gz | |
Merge mysql.com:/home/ram/work/mysql-5.1-maint
into mysql.com:/home/ram/work/b31615/b31615.5.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_ucs.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/ctype_ucs.test | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result index 1097486f185..06774125b30 100644 --- a/mysql-test/r/ctype_ucs.result +++ b/mysql-test/r/ctype_ucs.result @@ -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); diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test index bca3a9c3a96..a56a8b6eeed 100644 --- a/mysql-test/t/ctype_ucs.test +++ b/mysql-test/t/ctype_ucs.test @@ -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 # |