diff options
| author | serg@serg.mylan <> | 2005-03-28 10:20:41 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-03-28 10:20:41 +0200 |
| commit | a2f7cceb82b8908d5c2bfef9a321678e9b2ca975 (patch) | |
| tree | 2549753cbecdd4c0529de50a62a13edf512dae25 /mysql-test | |
| parent | a2ad96cf9ea41db53a6903eaf95ed76d9b39de10 (diff) | |
| parent | 06bcfe8886383e41b01e526e390b3fdd68089341 (diff) | |
| download | mariadb-git-a2f7cceb82b8908d5c2bfef9a321678e9b2ca975.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_utf8.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/func_system.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/ctype_utf8.test | 11 | ||||
| -rw-r--r-- | mysql-test/t/func_system.test | 2 |
4 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index 314567a1544..78c56bffbd3 100644 --- a/mysql-test/r/ctype_utf8.result +++ b/mysql-test/r/ctype_utf8.result @@ -871,3 +871,17 @@ drop table t1; select convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8); convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8) 1 +set names latin1; +create table t1 (a varchar(10)) character set utf8; +insert into t1 values ('test'); +select ifnull(a,'') from t1; +ifnull(a,'') +test +drop table t1; +select repeat(_utf8'+',3) as h union select NULL; +h ++++ +NULL +select ifnull(NULL, _utf8'string'); +ifnull(NULL, _utf8'string') +string diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result index d0ac9d781a4..137c25a2db5 100644 --- a/mysql-test/r/func_system.result +++ b/mysql-test/r/func_system.result @@ -75,4 +75,8 @@ select * from t1 where a=database(); a select * from t1 where a=user(); a +insert into t1 values ('a'); +select left(concat(a,version()),1) from t1; +left(concat(a,version()),1) +a drop table t1; diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test index 2c498cd1922..194354f8718 100644 --- a/mysql-test/t/ctype_utf8.test +++ b/mysql-test/t/ctype_utf8.test @@ -707,3 +707,14 @@ drop table t1; # Bug#8385: utf8_general_ci treats Cyrillic letters I and SHORT I as the same # select convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8); + +# +# Bugs#5980: NULL requires a characterset in a union +# +set names latin1; +create table t1 (a varchar(10)) character set utf8; +insert into t1 values ('test'); +select ifnull(a,'') from t1; +drop table t1; +select repeat(_utf8'+',3) as h union select NULL; +select ifnull(NULL, _utf8'string'); diff --git a/mysql-test/t/func_system.test b/mysql-test/t/func_system.test index 7fff165e057..bbfef25bcfe 100644 --- a/mysql-test/t/func_system.test +++ b/mysql-test/t/func_system.test @@ -38,4 +38,6 @@ create table t1 (a char(10)) character set latin1; select * from t1 where a=version(); select * from t1 where a=database(); select * from t1 where a=user(); +insert into t1 values ('a'); +select left(concat(a,version()),1) from t1; drop table t1; |