mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
serg@serg.mylan 2005-03-28 10:20:41 +02:00
commit a2f7cceb82
4 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mysql-test/r/ctype_utf8.result
View file

@ -871,3 +871,17 @@ drop table t1;
select convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8); select convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8);
convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8) convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8)
1 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

4
mysql-test/r/func_system.result
View file

@ -75,4 +75,8 @@ select * from t1 where a=database();
a a
select * from t1 where a=user(); select * from t1 where a=user();
a a
insert into t1 values ('a');
select left(concat(a,version()),1) from t1;
left(concat(a,version()),1)
a
drop table t1; drop table t1;

11
mysql-test/t/ctype_utf8.test
View file

@ -707,3 +707,14 @@ drop table t1;
# Bug#8385: utf8_general_ci treats Cyrillic letters I and SHORT I as the same # Bug#8385: utf8_general_ci treats Cyrillic letters I and SHORT I as the same
# #
select convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8); 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');

2
mysql-test/t/func_system.test
View file

@ -38,4 +38,6 @@ create table t1 (a char(10)) character set latin1;
select * from t1 where a=version(); select * from t1 where a=version();
select * from t1 where a=database(); select * from t1 where a=database();
select * from t1 where a=user(); select * from t1 where a=user();
insert into t1 values ('a');
select left(concat(a,version()),1) from t1;
drop table t1; drop table t1;