Commit 077b649a authored by unknown's avatar unknown
Browse files

Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows

parent 71583c89

mysql-test/r/ctype_ucs.result

+7 −7
Original line number Diff line number Diff line
@@ -726,26 +726,26 @@ drop table if exists bug20536; 
set names latin1;

create table bug20536 (id bigint not null auto_increment primary key, name

varchar(255) character set ucs2 not null);

insert into `bug20536` (`id`,`name`) values (1, _latin1 x'74657374311a'), (2, "'test\\_2'");

insert into `bug20536` (`id`,`name`) values (1, _latin1 x'7465737431'), (2, "'test\\_2'");

select md5(name) from bug20536;

md5(name)

3417d830fe24ffb2f81a28e54df2d1b3

f4b7ce8b45a20e3c4e84bef515d1525c

48d95db0d8305c2fe11548a3635c9385

select sha1(name) from bug20536;

sha1(name)

72228a6d56efb7a89a09543068d5d8fa4c330881

e0b52f38deddb9f9e8d5336b153592794cb49baf

677d4d505355eb5b0549b865fcae4b7f0c28aef5

select make_set(3, name, upper(name)) from bug20536;

make_set(3, name, upper(name))

test1,TEST1

test1,TEST1

'test\_2','TEST\_2'

select export_set(5, name, upper(name)) from bug20536;

export_set(5, name, upper(name))

test1,TEST1,test1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1

test1,TEST1,test1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1,TEST1

'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2','TEST\_2'

select export_set(5, name, upper(name), ",", 5) from bug20536;

export_set(5, name, upper(name), ",", 5)

test1,TEST1,test1,TEST1,TEST1

test1,TEST1,test1,TEST1,TEST1

'test\_2','TEST\_2','test\_2','TEST\_2','TEST\_2'

select password(name) from bug20536;

password(name)
@@ -761,7 +761,7 @@ SA5pDi1UPZdys 
SA5pDi1UPZdys

select quote(name) from bug20536;

quote(name)

??????????

????????

????????????????

drop table bug20536;

End of 4.1 tests

mysql-test/t/ctype_ucs.test

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ drop table if exists bug20536; 
set names latin1;

create table bug20536 (id bigint not null auto_increment primary key, name

varchar(255) character set ucs2 not null);

insert into `bug20536` (`id`,`name`) values (1, _latin1 x'74657374311a'), (2, "'test\\_2'");

insert into `bug20536` (`id`,`name`) values (1, _latin1 x'7465737431'), (2, "'test\\_2'");

select md5(name) from bug20536;

select sha1(name) from bug20536;

select make_set(3, name, upper(name)) from bug20536;