Commit bac62fa3 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-4.1 

into  mysql.com:/home/hf/mysql-5.0.mrg


include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
strings/ctype-mb.c:
  SCCS merged
strings/ctype-utf8.c:
  SCCS merged
parents 4fc50652 1ba54cad

include/m_ctype.h

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ enum my_lex_states 


struct charset_info_st;





/* See strings/CHARSET_INFO.txt for information about this structure  */

typedef struct my_collation_handler_st

{

  my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
@@ -154,6 +156,7 @@ extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler; 
extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;





/* See strings/CHARSET_INFO.txt about information on this structure  */

typedef struct my_charset_handler_st

{

  my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
@@ -216,6 +219,7 @@ extern MY_CHARSET_HANDLER my_charset_8bit_handler; 
extern MY_CHARSET_HANDLER my_charset_ucs2_handler;





/* See strings/CHARSET_INFO.txt about information on this structure  */

typedef struct charset_info_st

{

  uint      number;

mysql-test/r/ctype_utf8.result

+75 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,81 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

set names utf8;

create table t1 (s1 char(5) character set utf8);

insert into t1 values

('a'),('b'),(null),('ペテルグル'),('ü'),('Y');

create index it1 on t1 (s1);

select s1 as before_delete_general_ci from t1 where s1 like 'ペテ%';

before_delete_general_ci

ペテルグル

delete from t1 where s1 = 'Y';

select s1 as after_delete_general_ci from t1 where s1 like 'ペテ%';

after_delete_general_ci

ペテルグル

drop table t1;

set names utf8;

create table t1 (s1 char(5) character set utf8 collate utf8_unicode_ci);

insert into t1 values

('a'),('b'),(null),('ペテルグル'),('ü'),('Y');

create index it1 on t1 (s1);

select s1 as before_delete_unicode_ci from t1 where s1 like 'ペテ%';

before_delete_unicode_ci

ペテルグル

delete from t1 where s1 = 'Y';

select s1 as after_delete_unicode_ci from t1 where s1 like 'ペテ%';

after_delete_unicode_ci

ペテルグル

drop table t1;

set names utf8;

create table t1 (s1 char(5) character set utf8 collate utf8_bin);

insert into t1 values

('a'),('b'),(null),('ペテルグル'),('ü'),('Y');

create index it1 on t1 (s1);

select s1 as before_delete_bin from t1 where s1 like 'ペテ%';

before_delete_bin

ペテルグル

delete from t1 where s1 = 'Y';

select s1 as after_delete_bin from t1 where s1 like 'ペテ%';

after_delete_bin

ペテルグル

drop table t1;

set names utf8;

create table t1 (a varchar(30) not null primary key)

engine=innodb  default character set utf8 collate utf8_general_ci;

insert into t1 values ('あいうえおかきくけこさしすせそ');

insert into t1 values ('さしすせそかきくけこあいうえお');

select a as gci1 from t1 where a like 'さしすせそかきくけこあいうえお%';

gci1

さしすせそかきくけこあいうえお

select a as gci2 from t1 where a like 'あいうえおかきくけこさしすせそ';

gci2

あいうえおかきくけこさしすせそ

drop table t1;

set names utf8;

create table t1 (a varchar(30) not null primary key)

engine=innodb default character set utf8 collate utf8_unicode_ci;

insert into t1 values ('あいうえおかきくけこさしすせそ');

insert into t1 values ('さしすせそかきくけこあいうえお');

select a as uci1 from t1 where a like 'さしすせそかきくけこあいうえお%';

uci1

さしすせそかきくけこあいうえお

select a as uci2 from t1 where a like 'あいうえおかきくけこさしすせそ';

uci2

あいうえおかきくけこさしすせそ

drop table t1;

set names utf8;

create table t1 (a varchar(30) not null primary key)

engine=innodb default character set utf8 collate utf8_bin;

insert into t1 values ('あいうえおかきくけこさしすせそ');

insert into t1 values ('さしすせそかきくけこあいうえお');

select a as bin1 from t1 where a like 'さしすせそかきくけこあいうえお%';

bin1

さしすせそかきくけこあいうえお

select a as bin2 from t1 where a like 'あいうえおかきくけこさしすせそ';

bin2

あいうえおかきくけこさしすせそ

drop table t1;

SET NAMES utf8;

CREATE TABLE t1 (id int PRIMARY KEY,

a varchar(16) collate utf8_unicode_ci NOT NULL default '',

mysql-test/r/type_enum.result

+9 −0
Original line number Diff line number Diff line
@@ -1745,3 +1745,12 @@ create table t1 (a set('x','y') default 'x'); 
alter table t1 alter a set default 'z';

ERROR 42000: Invalid default value for 'a'

drop table t1;

create table t1 (f1 int);

alter table t1 add f2 enum(0xFFFF);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `f1` int(11) default NULL,

  `f2` enum('') default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/t/ctype_utf8.test

+70 −0
Original line number Diff line number Diff line
@@ -941,6 +941,76 @@ INSERT INTO t1 VALUES('uUABCDEFGHIGKLMNOPRSTUVWXYZ̈bbbbbbbbbbbbbbbbbbbbbbbbbbbb 
check table t1;

drop table t1;



#

# Bug#20471 LIKE search fails with indexed utf8 char column

#

set names utf8;

create table t1 (s1 char(5) character set utf8);

insert into t1 values

('a'),('b'),(null),('ペテルグル'),('ü'),('Y');

create index it1 on t1 (s1);

select s1 as before_delete_general_ci from t1 where s1 like 'ペテ%';

delete from t1 where s1 = 'Y';

select s1 as after_delete_general_ci from t1 where s1 like 'ペテ%';

drop table t1;



set names utf8;

create table t1 (s1 char(5) character set utf8 collate utf8_unicode_ci);

insert into t1 values

('a'),('b'),(null),('ペテルグル'),('ü'),('Y');

create index it1 on t1 (s1);

select s1 as before_delete_unicode_ci from t1 where s1 like 'ペテ%';

delete from t1 where s1 = 'Y';

select s1 as after_delete_unicode_ci from t1 where s1 like 'ペテ%';

drop table t1;



set names utf8;

create table t1 (s1 char(5) character set utf8 collate utf8_bin);

insert into t1 values

('a'),('b'),(null),('ペテルグル'),('ü'),('Y');

create index it1 on t1 (s1);

select s1 as before_delete_bin from t1 where s1 like 'ペテ%';

delete from t1 where s1 = 'Y';

select s1 as after_delete_bin from t1 where s1 like 'ペテ%';

drop table t1;



# additional tests from duplicate bug#20744 MySQL return no result



set names utf8;

--disable_warnings

create table t1 (a varchar(30) not null primary key)

engine=innodb  default character set utf8 collate utf8_general_ci;

--enable_warnings

insert into t1 values ('あいうえおかきくけこさしすせそ');

insert into t1 values ('さしすせそかきくけこあいうえお');

select a as gci1 from t1 where a like 'さしすせそかきくけこあいうえお%';

select a as gci2 from t1 where a like 'あいうえおかきくけこさしすせそ';

drop table t1;



set names utf8;

--disable_warnings

create table t1 (a varchar(30) not null primary key)

engine=innodb default character set utf8 collate utf8_unicode_ci;

--enable_warnings

insert into t1 values ('あいうえおかきくけこさしすせそ');

insert into t1 values ('さしすせそかきくけこあいうえお');

select a as uci1 from t1 where a like 'さしすせそかきくけこあいうえお%';

select a as uci2 from t1 where a like 'あいうえおかきくけこさしすせそ';

drop table t1;



set names utf8;

--disable_warnings

create table t1 (a varchar(30) not null primary key)

engine=innodb default character set utf8 collate utf8_bin;

--enable_warnings

insert into t1 values ('あいうえおかきくけこさしすせそ');

insert into t1 values ('さしすせそかきくけこあいうえお');

select a as bin1 from t1 where a like 'さしすせそかきくけこあいうえお%';

select a as bin2 from t1 where a like 'あいうえおかきくけこさしすせそ';

drop table t1;







#

# Bug#14896: Comparison with a key in a partial index over mb chararacter field

#

mysql-test/t/type_enum.test

+9 −0
Original line number Diff line number Diff line
@@ -127,4 +127,13 @@ create table t1 (a set('x','y') default 'x'); 
alter table t1 alter a set default 'z';

drop table t1;





#

# Bug#20922 mysql removes a name of first column in a table

#

create table t1 (f1 int);

alter table t1 add f2 enum(0xFFFF);

show create table t1;

drop table t1;



# End of 4.1 tests