Commit 35b20797 authored by bar@bar.myoffice.izhnet.ru's avatar bar@bar.myoffice.izhnet.ru
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
parents ed0ab76e 40f68cd4

mysql-test/include/ctype_regex.inc

0 → 100644
+42 −0
Original line number Diff line number Diff line 
#

# To test a desired collation, set session.collation_connection to

# this collation before including this file

#



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# Create a table with two varchar(64) null-able column,

# using current values of

# @@character_set_connection and  @@collation_connection.

#



create table t1 as

select repeat(' ', 64) as s1, repeat(' ',64) as s2

union

select null, null;

show create table t1;

delete from t1;



insert into t1 values('aaa','aaa');

insert into t1 values('aaa|qqq','qqq');

insert into t1 values('gheis','^[^a-dXYZ]+$');

insert into t1 values('aab','^aa?b');

insert into t1 values('Baaan','^Ba*n');

insert into t1 values('aaa','qqq|aaa');

insert into t1 values('qqq','qqq|aaa');



insert into t1 values('bbb','qqq|aaa');

insert into t1 values('bbb','qqq');

insert into t1 values('aaa','aba');



insert into t1 values(null,'abc');

insert into t1 values('def',null);

insert into t1 values(null,null);

insert into t1 values('ghi','ghi[');



select HIGH_PRIORITY s1 regexp s2 from t1;



drop table t1;

mysql-test/r/ctype_uca.result

+45 −0
Original line number Diff line number Diff line
@@ -2754,4 +2754,49 @@ a 
c

ch

drop table t1;

set collation_connection=ucs2_unicode_ci;

drop table if exists t1;

create table t1 as

select repeat(' ', 64) as s1, repeat(' ',64) as s2

union

select null, null;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `s1` varchar(64) character set ucs2 collate ucs2_unicode_ci default NULL,

  `s2` varchar(64) character set ucs2 collate ucs2_unicode_ci default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

delete from t1;

insert into t1 values('aaa','aaa');

insert into t1 values('aaa|qqq','qqq');

insert into t1 values('gheis','^[^a-dXYZ]+$');

insert into t1 values('aab','^aa?b');

insert into t1 values('Baaan','^Ba*n');

insert into t1 values('aaa','qqq|aaa');

insert into t1 values('qqq','qqq|aaa');

insert into t1 values('bbb','qqq|aaa');

insert into t1 values('bbb','qqq');

insert into t1 values('aaa','aba');

insert into t1 values(null,'abc');

insert into t1 values('def',null);

insert into t1 values(null,null);

insert into t1 values('ghi','ghi[');

select HIGH_PRIORITY s1 regexp s2 from t1;

s1 regexp s2

1

1

1

1

1

1

1

0

0

0

NULL

NULL

NULL

NULL

drop table t1;

set names utf8;

End for 5.0 tests

mysql-test/r/ctype_ucs.result

+45 −0
Original line number Diff line number Diff line
@@ -922,4 +922,49 @@ ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_gen 
select * from t1 where a=if(b<10,_ucs2 0x0062,_ucs2 0x00C0);

ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation '='

drop table t1;

set collation_connection=ucs2_general_ci;

drop table if exists t1;

create table t1 as

select repeat(' ', 64) as s1, repeat(' ',64) as s2

union

select null, null;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `s1` varchar(64) character set ucs2 default NULL,

  `s2` varchar(64) character set ucs2 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

delete from t1;

insert into t1 values('aaa','aaa');

insert into t1 values('aaa|qqq','qqq');

insert into t1 values('gheis','^[^a-dXYZ]+$');

insert into t1 values('aab','^aa?b');

insert into t1 values('Baaan','^Ba*n');

insert into t1 values('aaa','qqq|aaa');

insert into t1 values('qqq','qqq|aaa');

insert into t1 values('bbb','qqq|aaa');

insert into t1 values('bbb','qqq');

insert into t1 values('aaa','aba');

insert into t1 values(null,'abc');

insert into t1 values('def',null);

insert into t1 values(null,null);

insert into t1 values('ghi','ghi[');

select HIGH_PRIORITY s1 regexp s2 from t1;

s1 regexp s2

1

1

1

1

1

1

1

0

0

0

NULL

NULL

NULL

NULL

drop table t1;

set names latin1;

End of 5.0 tests

mysql-test/r/ctype_utf8.result

+45 −0
Original line number Diff line number Diff line
@@ -267,6 +267,51 @@ b 
select * from t1 where a = 'b' and a != 'b';

a

drop table t1;

set collation_connection=utf8_general_ci;

drop table if exists t1;

create table t1 as

select repeat(' ', 64) as s1, repeat(' ',64) as s2

union

select null, null;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `s1` varchar(64) character set utf8 default NULL,

  `s2` varchar(64) character set utf8 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

delete from t1;

insert into t1 values('aaa','aaa');

insert into t1 values('aaa|qqq','qqq');

insert into t1 values('gheis','^[^a-dXYZ]+$');

insert into t1 values('aab','^aa?b');

insert into t1 values('Baaan','^Ba*n');

insert into t1 values('aaa','qqq|aaa');

insert into t1 values('qqq','qqq|aaa');

insert into t1 values('bbb','qqq|aaa');

insert into t1 values('bbb','qqq');

insert into t1 values('aaa','aba');

insert into t1 values(null,'abc');

insert into t1 values('def',null);

insert into t1 values(null,null);

insert into t1 values('ghi','ghi[');

select HIGH_PRIORITY s1 regexp s2 from t1;

s1 regexp s2

1

1

1

1

1

1

1

0

0

0

NULL

NULL

NULL

NULL

drop table t1;

set names utf8;

set names utf8;

select  'вася'  rlike '[[:<:]]вася[[:>:]]';

'вася'  rlike '[[:<:]]вася[[:>:]]'

mysql-test/r/func_regexp.result

+13 −1
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (s1 char(64),s2 char(64));

set names latin1;

drop table if exists t1;

create table t1 as

select repeat(' ', 64) as s1, repeat(' ',64) as s2

union

select null, null;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `s1` varchar(64) default NULL,

  `s2` varchar(64) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

delete from t1;

insert into t1 values('aaa','aaa');

insert into t1 values('aaa|qqq','qqq');

insert into t1 values('gheis','^[^a-dXYZ]+$');