Commit 8a7c1e73 authored by unknown's avatar unknown
Browse files

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/alexi/innodb/mysql-5.1-xx269
parents 2eaf00c6 050f14ac

mysql-test/r/innodb.result

+440 −2
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ innodb_sync_spin_loops 20 
show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	20

set global innodb_thread_concurrency=1000;

set global innodb_thread_concurrency=1001;

show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	1000
@@ -2661,6 +2661,32 @@ 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;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

4	E880BDD0B1E880BD	E880BDD0B1E880BD	seven

4	E880BDE880BD	E880BDE880BD	six

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

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

a	hex(b)	hex(c)	filler

4	05630563	05630563	email

4	0563	0563	email

4	05612020	05612020	email

4	01FC	01FC	email

4	0120	0120	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	0000E400	0000E400	email

4	0000563001FC0563	0000563001FC0563	email

1	0061006200630064006500660067	0061006200630064006500660067	one

3	0071007200730074007500760077	0071007200730074007500760077	three

2	0069006A006B0069006C006D006E	0069006A006B0069006C006D006E	two

drop table t1;

drop table t2;

create table t1 (
@@ -2689,6 +2715,32 @@ 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;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

4	E880BDD0B1E880BD	E880BDD0B1E880BD	seven

4	E880BDE880BD	E880BDE880BD	six

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

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

a	hex(b)	hex(c)	filler

4	05630563	05630563	email

4	0563	0563	email

4	05612020	05612020	email

4	01FC	01FC	email

4	0120	0120	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	0000E400	0000E400	email

4	0000563001FC0563	0000563001FC0563	email

1	0061006200630064006500660067	0061006200630064006500660067	one

3	0071007200730074007500760077	0071007200730074007500760077	three

2	0069006A006B0069006C006D006E	0069006A006B0069006C006D006E	two

drop table t1;

drop table t2;

create table t1 (
@@ -2717,6 +2769,32 @@ 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;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

4	E880BDD0B1E880BD	E880BDD0B1E880BD	seven

4	E880BDE880BD	E880BDE880BD	six

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

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

a	hex(b)	hex(c)	filler

4	0120	0120	email

4	01FC	01FC	email

4	0563	0563	email

4	0000563001FC0563	0000563001FC0563	email

4	0000E400	0000E400	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	05612020	05612020	email

4	05630563	05630563	email

1	0061006200630064006500660067	0061006200630064006500660067	one

3	0071007200730074007500760077	0071007200730074007500760077	three

2	0069006A006B0069006C006D006E	0069006A006B0069006C006D006E	two

drop table t1;

drop table t2;

create table t1 (
@@ -2741,9 +2819,92 @@ 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;

a	hex(b)	hex(c)	filler

1	61626364656667	61626364656667	boo

4	D0B1	D0B1	eight

4	5B	5B	five

4	E880BD	E880BD	four

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

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

a	hex(b)	hex(c)	filler

4	0000E400	0000E400	email

4	00640065	00640065	email

4	00E400E50068	00E400E50068	email

4	0120	0120	email

4	01FC	01FC	email

4	05612020	05612020	email

4	0563	0563	email

1	61626364656667	61626364656667	one

3	71727374757677	71727374757677	three

2	696A6B696C6D6E	696A6B696C6D6E	two

drop table t1;

drop table t2;

commit;

set foreign_key_checks=0;

create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb;

create table t1(a char(10) primary key, b varchar(20)) engine = innodb;

ERROR HY000: Can't create table 'test.t1' (errno: 150)

set foreign_key_checks=1;

drop table t2;

set foreign_key_checks=0;

create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;

ERROR HY000: Can't create table 'test.t2' (errno: 150)

set foreign_key_checks=1;

drop table t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb;

create table t1(a varchar(10) primary key) engine = innodb;

alter table t1 modify column a int;

Got one of the listed errors

set foreign_key_checks=1;

drop table t2,t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;

create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;

alter table t1 convert to character set utf8;

set foreign_key_checks=1;

drop table t2,t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;

create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8;

rename table t3 to t1;

ERROR HY000: Error on rename of './test/t3' to './test/t1' (errno: 150)

set foreign_key_checks=1;

drop table t2,t3;

create table t1(a int primary key) row_format=redundant engine=innodb;

create table t2(a int primary key,constraint foreign key(a)references t1(a)) row_format=compact engine=innodb;

create table t3(a int primary key) row_format=compact engine=innodb;

create table t4(a int primary key,constraint foreign key(a)references t3(a)) row_format=redundant engine=innodb;

insert into t1 values(1);

insert into t3 values(1);

insert into t2 values(2);

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

insert into t4 values(2);

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

insert into t2 values(1);

insert into t4 values(1);

update t1 set a=2;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

update t2 set a=2;

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

update t3 set a=2;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

update t4 set a=2;

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

truncate t1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))

truncate t3;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t4`, CONSTRAINT `t4_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t3` (`a`))

truncate t2;

truncate t4;

truncate t1;

truncate t3;

drop table t4,t3,t2,t1;

create table t1 (a varchar(255) character set utf8,

b varchar(255) character set utf8,

c varchar(255) character set utf8,
@@ -2757,7 +2918,284 @@ d varchar(255) character set utf8, 
e varchar(255) character set utf8,

key (a,b,c,d,e)) engine=innodb;

ERROR 42000: Specified key was too long; max key length is 3072 bytes

End of 5.0 tests

create table t1 (s1 varbinary(2),primary key (s1)) engine=innodb;

create table t2 (s1 binary(2),primary key (s1)) engine=innodb;

create table t3 (s1 varchar(2) binary,primary key (s1)) engine=innodb;

create table t4 (s1 char(2) binary,primary key (s1)) engine=innodb;

insert into t1 values (0x41),(0x4120),(0x4100);

insert into t2 values (0x41),(0x4120),(0x4100);

ERROR 23000: Duplicate entry 'A' for key 'PRIMARY'

insert into t2 values (0x41),(0x4120);

insert into t3 values (0x41),(0x4120),(0x4100);

ERROR 23000: Duplicate entry 'A ' for key 'PRIMARY'

insert into t3 values (0x41),(0x4100);

insert into t4 values (0x41),(0x4120),(0x4100);

ERROR 23000: Duplicate entry 'A' for key 'PRIMARY'

insert into t4 values (0x41),(0x4100);

select hex(s1) from t1;

hex(s1)

41

4100

4120

select hex(s1) from t2;

hex(s1)

4100

4120

select hex(s1) from t3;

hex(s1)

4100

41

select hex(s1) from t4;

hex(s1)

4100

41

drop table t1,t2,t3,t4;

create table t1 (a int primary key,s1 varbinary(3) not null unique) engine=innodb;

create table t2 (s1 binary(2) not null, constraint c foreign key(s1) references t1(s1) on update cascade) engine=innodb;

insert into t1 values(1,0x4100),(2,0x41),(3,0x4120),(4,0x42);

insert into t2 values(0x42);

ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

insert into t2 values(0x41);

select hex(s1) from t2;

hex(s1)

4100

update t1 set s1=0x123456 where a=2;

select hex(s1) from t2;

hex(s1)

4100

update t1 set s1=0x12 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

update t1 set s1=0x12345678 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

update t1 set s1=0x123457 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

update t1 set s1=0x1220 where a=1;

select hex(s1) from t2;

hex(s1)

1220

update t1 set s1=0x1200 where a=1;

select hex(s1) from t2;

hex(s1)

1200

update t1 set s1=0x4200 where a=1;

select hex(s1) from t2;

hex(s1)

4200

delete from t1 where a=1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

delete from t1 where a=2;

update t2 set s1=0x4120;

delete from t1;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

delete from t1 where a!=3;

select a,hex(s1) from t1;

a	hex(s1)

3	4120

select hex(s1) from t2;

hex(s1)

4120

drop table t2,t1;

create table t1 (a int primary key,s1 varchar(2) binary not null unique) engine=innodb;

create table t2 (s1 char(2) binary not null, constraint c foreign key(s1) references t1(s1) on update cascade) engine=innodb;

insert into t1 values(1,0x4100),(2,0x41);

insert into t2 values(0x41);

select hex(s1) from t2;

hex(s1)

41

update t1 set s1=0x1234 where a=1;

select hex(s1) from t2;

hex(s1)

41

update t1 set s1=0x12 where a=2;

select hex(s1) from t2;

hex(s1)

12

delete from t1 where a=1;

delete from t1 where a=2;

ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `c` FOREIGN KEY (`s1`) REFERENCES `t1` (`s1`) ON UPDATE CASCADE)

select a,hex(s1) from t1;

a	hex(s1)

2	12

select hex(s1) from t2;

hex(s1)

12

drop table t2,t1;

CREATE TABLE t1 (

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

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE t2 (

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

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB 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;

hex(ind)	hex(string1)

31	

32	

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

hex(ind)	hex(string1)

0031	

0032	

drop table t1,t2;

CREATE TABLE t1 (

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

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE t2 (

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

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB 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;

hex(ind)	hex(string1)

31	

32	

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

hex(ind)	hex(string1)

0031	

0032	

drop table t1,t2;

CREATE TABLE t1 (

ind bit not null,

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE t2 (

ind bit not null,

string1 varchar(250) NOT NULL,

PRIMARY KEY  (ind)

) ENGINE=InnoDB 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;

hex(ind)	hex(string1)

0	

1	

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

hex(ind)	hex(string1)

0	

1	

drop table t1,t2;

create table t2 (

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

) character set utf8 engine = innodb;

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;

create table t2 (

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

) character set ucs2 engine = innodb;

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;

create table t1(a int not null, b char(110),primary key(a,b(100))) engine=innodb 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;

a	hex(b)

1	61626364656667

2	6465666768696A6B

6	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1

7	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2

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

drop table t1;

create table t1(a int not null, b text(110),primary key(a,b(100))) engine=innodb 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;

a	hex(b)

1	61626364656667

2	6465666768696A6B

6	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1

7	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2

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

drop table t1;

CREATE TABLE t1(a INT, PRIMARY KEY(a)) ENGINE=InnoDB;

CREATE TABLE t2(a INT) ENGINE=InnoDB;

ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1(a);

ALTER TABLE t2 DROP FOREIGN KEY t2_ibfk_1;

ALTER TABLE t2 ADD CONSTRAINT t2_ibfk_0 FOREIGN KEY (a) REFERENCES t1(a);

ALTER TABLE t2 DROP FOREIGN KEY t2_ibfk_0;

SHOW CREATE TABLE t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` int(11) DEFAULT NULL,

  KEY `t2_ibfk_0` (`a`),

  CONSTRAINT `t2_ibfk_0` FOREIGN KEY (`a`) REFERENCES `t1` (`a`),

  CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

DROP TABLE t2,t1;

create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

insert into t1(a) values (1),(2),(3);

commit;

set autocommit = 0;

update t1 set b = 5 where a = 2;

create trigger t1t before insert on t1 for each row begin set NEW.b = NEW.a * 10 + 5, NEW.c = NEW.a / 10; end |

set autocommit = 0;

insert into t1(a) values (10),(20),(30),(40),(50),(60),(70),(80),(90),(100),

(11),(21),(31),(41),(51),(61),(71),(81),(91),(101),

(12),(22),(32),(42),(52),(62),(72),(82),(92),(102),

(13),(23),(33),(43),(53),(63),(73),(83),(93),(103),

(14),(24),(34),(44),(54),(64),(74),(84),(94),(104);

commit;

commit;

drop trigger t1t;

drop table t1;

create table t1(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t2(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t3(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t4(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

create table t5(a int not null, b int, c int, d int, primary key(a)) engine=innodb;

insert into t1(a) values (1),(2),(3);

insert into t2(a) values (1),(2),(3);

insert into t3(a) values (1),(2),(3);

insert into t4(a) values (1),(2),(3);

insert into t3(a) values (5),(7),(8);

insert into t4(a) values (5),(7),(8);

insert into t5(a) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12);

create trigger t1t before insert on t1 for each row begin 

INSERT INTO t2 SET a = NEW.a;

end |

create trigger t2t before insert on t2 for each row begin

DELETE FROM t3 WHERE a = NEW.a;

end |

create trigger t3t before delete on t3 for each row begin  

UPDATE t4 SET b = b + 1 WHERE a = OLD.a;

end |

create trigger t4t before update on t4 for each row begin

UPDATE t5 SET b = b + 1 where a = NEW.a;

end |

commit;

set autocommit = 0;

update t1 set b = b + 5 where a = 1;

update t2 set b = b + 5 where a = 1;

update t3 set b = b + 5 where a = 1;

update t4 set b = b + 5 where a = 1;

insert into t5(a) values(20);

set autocommit = 0;

insert into t1(a) values(7);

insert into t2(a) values(8);

delete from t2 where a = 3;

update t4 set b = b + 1 where a = 3;

commit;

drop trigger t1t;

drop trigger t2t;

drop trigger t3t;

drop trigger t4t;

drop table t1, t2, t3, t4, t5;

CREATE TABLE t1 (

field1 varchar(8) NOT NULL DEFAULT '',

field2 varchar(8) NOT NULL DEFAULT '',

mysql-test/r/innodb_unsafe_binlog.result

0 → 100644
+35 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

create table t1 (id int not null, f_id int not null, f int not null,

primary key(f_id, id)) engine=innodb;

create table t2 (id int not null,s_id int not null,s varchar(200),

primary key(id)) engine=innodb;

INSERT INTO t1 VALUES (8, 1, 3);

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

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

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

commit;

DELETE ml.* FROM t1 AS ml LEFT JOIN t2 AS mm ON (mm.id=ml.id)

WHERE mm.id IS NULL;

select ml.* from t1 as ml left join t2 as mm on (mm.id=ml.id)

where mm.id is null lock in share mode;

id	f_id	f

drop table t1,t2;

create table t1(a int not null, b int, primary key(a)) engine=innodb;

insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);

commit;

set autocommit = 0;

select * from t1 lock in share mode;

a	b

1	1

2	2

3	1

4	2

5	1

6	2

update t1 set b = 5 where b = 1;

set autocommit = 0;

select * from t1 where a = 2 and b = 2 for update;

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

commit;

commit;

drop table t1;

mysql-test/t/innodb.test

+371 −2

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/innodb_unsafe_binlog-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--innodb_locks_unsafe_for_binlog=true

mysql-test/t/innodb_unsafe_binlog.test

0 → 100644
+55 −0
Original line number Diff line number Diff line 
-- source include/have_innodb.inc

#

# Note that these tests uses a innodb_locks_unsafe_for_binlog option.

#

#

# Test cases for a bug #15650

#



--disable_warnings

drop table if exists t1,t2;

--enable_warnings

create table t1 (id int not null, f_id int not null, f int not null,

primary key(f_id, id)) engine=innodb;

create table t2 (id int not null,s_id int not null,s varchar(200),

primary key(id)) engine=innodb;

INSERT INTO t1 VALUES (8, 1, 3);

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

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

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

commit;

DELETE ml.* FROM t1 AS ml LEFT JOIN t2 AS mm ON (mm.id=ml.id)

WHERE mm.id IS NULL;

select ml.* from t1 as ml left join t2 as mm on (mm.id=ml.id)

where mm.id is null lock in share mode;

drop table t1,t2;



#

# Test case for unlock row bug where unlock releases all locks granted for

# a row. Only the latest lock should be released.

#



connect (a,localhost,root,,);

connect (b,localhost,root,,);

connection a;

create table t1(a int not null, b int, primary key(a)) engine=innodb;

insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);

commit;

set autocommit = 0; 

select * from t1 lock in share mode;

update t1 set b = 5 where b = 1;

connection b;

set autocommit = 0;

#

# S-lock to records (2,2),(4,2), and (6,2) should not be released in a update

#

--error 1205

select * from t1 where a = 2 and b = 2 for update;

connection a;

commit;

connection b;

commit;

drop table t1;

disconnect a;

disconnect b;