Commit 1bcf363e authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
parents 794c5567 67e31272

mysql-test/extra/binlog_tests/ctype_cp932.test

+14 −0
Original line number Diff line number Diff line
@@ -413,3 +413,17 @@ select * from t1; 
insert into t1 values ('abc');

select * from t1;

drop table t1;



#

# BUG#16217 - MySQL client misinterpretes multi-byte char as escape `\' 

#



# new command \C or charset

--exec $MYSQL --default-character-set=utf8 test -e "\C cp932 \g"

--exec $MYSQL --default-character-set=cp932 test -e "charset utf8;"



# its usage to switch internally in mysql to requested charset

--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select '\'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('\'); select * from t1;  drop table t1;"

--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select '\'"

--exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select '\'"

--exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select '\'"

mysql-test/include/mix2.inc

+0 −222
Original line number Diff line number Diff line
@@ -1770,139 +1770,6 @@ disconnect a; 
disconnect b;

}



#

# BUG 14056 Column prefix index on UTF-8 primary key column causes: Can't find record..

#



eval create table t1 (

  a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xe880bde880bd,_utf8 0xe880bde880bd,'six');

insert into t1 values (4,_utf8 0xe880bdD0B1e880bd,_utf8 0xe880bdD0B1e880bd,'seven');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');

insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;



eval create table t1 (

  a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xe880bde880bd,_utf8 0xe880bde880bd,'six');

insert into t1 values (4,_utf8 0xe880bdD0B1e880bd,_utf8 0xe880bdD0B1e880bd,'seven');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');

insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;



eval create table t1 (

  a int, b text(10), c text(10), filler text(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b text(10), c text(10), filler text(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xe880bde880bd,_utf8 0xe880bde880bd,'six');

insert into t1 values (4,_utf8 0xe880bdD0B1e880bd,_utf8 0xe880bdD0B1e880bd,'seven');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');

insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;



eval create table t1 (

  a int, b blob(10), c blob(10), filler blob(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b blob(10), c blob(10), filler blob(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');

insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;

commit;



# tests for bugs #9802 and #13778



if ($test_foreign_keys)
@@ -2099,95 +1966,6 @@ drop table t2,t1; 
}

# End FOREIGN KEY tests



#

# Test cases for bug #15308 Problem of Order with Enum Column in Primary Key

#

eval CREATE TABLE t1 (

  ind enum('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=utf8;

eval CREATE TABLE t2 (

  ind enum('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=ucs2;



INSERT INTO t1 VALUES ('1', ''),('2', '');

INSERT INTO t2 VALUES ('1', ''),('2', '');

SELECT hex(ind),hex(string1) FROM t1 ORDER BY string1;

SELECT hex(ind),hex(string1) FROM t2 ORDER BY string1;

drop table t1,t2;



eval CREATE TABLE t1 (

  ind set('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=utf8;

eval CREATE TABLE t2 (

  ind set('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=ucs2;



INSERT INTO t1 VALUES ('1', ''),('2', '');

INSERT INTO t2 VALUES ('1', ''),('2', '');

SELECT hex(ind),hex(string1) FROM t1 ORDER BY string1;

SELECT hex(ind),hex(string1) FROM t2 ORDER BY string1;

drop table t1,t2;



eval CREATE TABLE t1 (

  ind bit not null,

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=utf8;

eval CREATE TABLE t2 (

  ind bit not null,

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=ucs2;

insert into t1 values(0,''),(1,'');

insert into t2 values(0,''),(1,'');

select hex(ind),hex(string1) from t1 order by string1;

select hex(ind),hex(string1) from t2 order by string1;

drop table t1,t2;



# tests for bug #14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'



eval create table t2 (

  a int, b char(10), filler char(10), primary key(a, b(2))

) character set utf8 engine = $engine_type;



insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;

eval create table t2 (

  a int, b char(10), filler char(10), primary key(a, b(2))

) character set ucs2 engine = $engine_type;



insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;



eval create table t1(a int not null, b char(110),primary key(a,b(100))) engine=$engine_type default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

update t1 set b = 'three' where a = 6;

drop table t1;

eval create table t1(a int not null, b text(110),primary key(a,b(100))) engine=$engine_type default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

update t1 set b = 'three' where a = 6;

drop table t1;



if ($test_foreign_keys)

{

# Ensure that <tablename>_ibfk_0 is not mistreated as a

mysql-test/include/mix2_ucs2.inc

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

# Tests from mix2.inc which require ucs2 character sets should go here

#



#

# BUG 14056 Column prefix index on UTF-8 primary key column causes: Can't find record..

#



eval create table t1 (

  a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xe880bde880bd,_utf8 0xe880bde880bd,'six');

insert into t1 values (4,_utf8 0xe880bdD0B1e880bd,_utf8 0xe880bdD0B1e880bd,'seven');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');

insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;



eval create table t1 (

  a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b varchar(10), c varchar(10), filler varchar(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xe880bde880bd,_utf8 0xe880bde880bd,'six');

insert into t1 values (4,_utf8 0xe880bdD0B1e880bd,_utf8 0xe880bdD0B1e880bd,'seven');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');





insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;



eval create table t1 (

  a int, b text(10), c text(10), filler text(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b text(10), c text(10), filler text(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xe880bde880bd,_utf8 0xe880bde880bd,'six');

insert into t1 values (4,_utf8 0xe880bdD0B1e880bd,_utf8 0xe880bdD0B1e880bd,'seven');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');

insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05630563,_ucs2 0x05630563,'eleven');

insert into t2 values (4,_ucs2 0x0563001fc0563,_ucs2 0x0563001fc0563,'point');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;



eval create table t1 (

  a int, b blob(10), c blob(10), filler blob(10), primary key(a, b(2)), unique key (a, c(2))

) character set utf8 engine = $engine_type;

eval create table t2 (

  a int, b blob(10), c blob(10), filler blob(10), primary key(a, b(2)), unique key (a, c(2))

) character set ucs2 engine = $engine_type;

insert into t1 values (1,'abcdefg','abcdefg','one');

insert into t1 values (2,'ijkilmn','ijkilmn','two');

insert into t1 values (3,'qrstuvw','qrstuvw','three');

insert into t1 values (4,_utf8 0xe880bd,_utf8 0xe880bd,'four');

insert into t1 values (4,_utf8 0x5b,_utf8 0x5b,'five');

insert into t1 values (4,_utf8 0xD0B1,_utf8 0xD0B1,'eight');

insert into t2 values (1,'abcdefg','abcdefg','one');

insert into t2 values (2,'ijkilmn','ijkilmn','two');

insert into t2 values (3,'qrstuvw','qrstuvw','three');

insert into t2 values (4,_ucs2 0x00e400,_ucs2 0x00e400,'four');

insert into t2 values (4,_ucs2 0x00640065,_ucs2 0x00640065,'five');

insert into t2 values (4,_ucs2 0x00e400e50068,_ucs2 0x00e400e50068,'six');

insert into t2 values (4,_ucs2 0x01fc,_ucs2 0x01fc,'seven');

insert into t2 values (4,_ucs2 0x0120,_ucs2 0x0120,'eight');

insert into t2 values (4,_ucs2 0x0563,_ucs2 0x0563,'ten');

insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken');

update t1 set filler = 'boo' where a = 1;

update t2 set filler ='email' where a = 4;

select a,hex(b),hex(c),filler from t1 order by filler;

select a,hex(b),hex(c),filler from t2 order by filler;

drop table t1;

drop table t2;

commit;



#

# Test cases for bug #15308 Problem of Order with Enum Column in Primary Key

#

eval CREATE TABLE t1 (

  ind enum('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=utf8;

eval CREATE TABLE t2 (

  ind enum('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=ucs2;



INSERT INTO t1 VALUES ('1', ''),('2', '');

INSERT INTO t2 VALUES ('1', ''),('2', '');

SELECT hex(ind),hex(string1) FROM t1 ORDER BY string1;

SELECT hex(ind),hex(string1) FROM t2 ORDER BY string1;

drop table t1,t2;



eval CREATE TABLE t1 (

  ind set('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=utf8;

eval CREATE TABLE t2 (

  ind set('0','1','2') NOT NULL default '0',

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=ucs2;



INSERT INTO t1 VALUES ('1', ''),('2', '');

INSERT INTO t2 VALUES ('1', ''),('2', '');

SELECT hex(ind),hex(string1) FROM t1 ORDER BY string1;

SELECT hex(ind),hex(string1) FROM t2 ORDER BY string1;

drop table t1,t2;



eval CREATE TABLE t1 (

  ind bit not null,

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=utf8;

eval CREATE TABLE t2 (

  ind bit not null,

  string1 varchar(250) NOT NULL,

  PRIMARY KEY  (ind)

) ENGINE=$engine_type DEFAULT CHARSET=ucs2;

insert into t1 values(0,''),(1,'');

insert into t2 values(0,''),(1,'');

select hex(ind),hex(string1) from t1 order by string1;

select hex(ind),hex(string1) from t2 order by string1;

drop table t1,t2;



# tests for bug #14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'



eval create table t2 (

  a int, b char(10), filler char(10), primary key(a, b(2))

) character set utf8 engine = $engine_type;



insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;

eval create table t2 (

  a int, b char(10), filler char(10), primary key(a, b(2))

) character set ucs2 engine = $engine_type;



insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;



eval create table t1(a int not null, b char(110),primary key(a,b(100))) engine=$engine_type default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

update t1 set b = 'three' where a = 6;

drop table t1;

eval create table t1(a int not null, b text(110),primary key(a,b(100))) engine=$engine_type default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

update t1 set b = 'three' where a = 6;

drop table t1;

mysql-test/r/binlog_stm_ctype_cp932.result

+10 −0
Original line number Diff line number Diff line
@@ -11353,3 +11353,13 @@ a 
a

a

drop table t1;

\

\

c_cp932

\

\

\

ソ

ソ

\

\

mysql-test/r/innodb-ucs2.result

0 → 100644
+313 −0

File added.

Preview size limit exceeded, changes collapsed.