Commit 9d0318a2 authored by ramil/ram@ramil.myoffice.izhnet.ru's avatar ramil/ram@ramil.myoffice.izhnet.ru
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/home/ram/work/b31070/b31070.5.0
parents 81d65227 6e6727d2

mysql-test/include/ctype_common.inc

+9 −0
Original line number Diff line number Diff line
@@ -51,6 +51,15 @@ SELECT c1 as want1result from t1 where c1 like 'locatio%'; 
SELECT c1 as want1result  from t1 where c1 like 'location%';

DROP TABLE t1;



#

# Bug #31070: crash during conversion of charsets

#

create table t1 (a set('a') not null);

insert into t1 values (),();

select cast(a as char(1)) from t1;

select a sounds like a from t1;

drop table t1;



DROP DATABASE d1;

# Restore settings

USE test;

mysql-test/r/ctype_big5.result

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@ SELECT c1 as want1result from t1 where c1 like 'location%'; 
want1result

location

DROP TABLE t1;

create table t1 (a set('a') not null);

insert into t1 values (),();

Warnings:

Warning	1364	Field 'a' doesn't have a default value

select cast(a as char(1)) from t1;

cast(a as char(1))





select a sounds like a from t1;

a sounds like a

1

1

drop table t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

mysql-test/r/ctype_euckr.result

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@ SELECT c1 as want1result from t1 where c1 like 'location%'; 
want1result

location

DROP TABLE t1;

create table t1 (a set('a') not null);

insert into t1 values (),();

Warnings:

Warning	1364	Field 'a' doesn't have a default value

select cast(a as char(1)) from t1;

cast(a as char(1))





select a sounds like a from t1;

a sounds like a

1

1

drop table t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

mysql-test/r/ctype_gb2312.result

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@ SELECT c1 as want1result from t1 where c1 like 'location%'; 
want1result

location

DROP TABLE t1;

create table t1 (a set('a') not null);

insert into t1 values (),();

Warnings:

Warning	1364	Field 'a' doesn't have a default value

select cast(a as char(1)) from t1;

cast(a as char(1))





select a sounds like a from t1;

a sounds like a

1

1

drop table t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

mysql-test/r/ctype_gbk.result

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@ SELECT c1 as want1result from t1 where c1 like 'location%'; 
want1result

location

DROP TABLE t1;

create table t1 (a set('a') not null);

insert into t1 values (),();

Warnings:

Warning	1364	Field 'a' doesn't have a default value

select cast(a as char(1)) from t1;

cast(a as char(1))





select a sounds like a from t1;

a sounds like a

1

1

drop table t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;