Commit 6cf0fcbf authored by Gleb Shchepa's avatar Gleb Shchepa
Browse files

auto merge 5.1-main --> 5.1-bugteam

parents f3978f77 23176f8f

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM 
#

# When changing major version number please also check switch statement

# in mysqlbinlog::check_master_version().

AM_INIT_AUTOMAKE(mysql, 5.1.26-rc)

AM_INIT_AUTOMAKE(mysql, 5.1.27)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10

mysql-test/r/repair.result

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ test.t1 check error Table upgrade required. Please do "REPAIR TABLE `t1`" to fix 
# REPAIR old table USE_FRM should fail

REPAIR TABLE t1 USE_FRM;

Table	Op	Msg_type	Msg_text

t1	repair	error	Failed reparing incompatible .FRM file

t1	repair	error	Failed repairing incompatible .frm file

# Run REPAIR TABLE to upgrade .frm file

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

mysql-test/r/subselect.result

+7 −0
Original line number Diff line number Diff line
@@ -4391,3 +4391,10 @@ SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1); 
s1

a

DROP TABLE t1;

CREATE TABLE t1(c int, KEY(c));

CREATE TABLE t2(a int, b int);

INSERT INTO t2 VALUES (1, 10), (2, NULL);

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

SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);

a	b

DROP TABLE t1,t2;

mysql-test/suite/bugs/r/rpl_bug33029.result

0 → 100644
+15 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create table `t1` (`id` int not null auto_increment primary key);

create trigger `trg` before insert on `t1` for each row begin end;

set @@global.debug="+d,simulate_bug33029";

stop slave;

start slave;

insert into `t1` values ();

select * from t1;

id

1

mysql-test/suite/bugs/t/rpl_bug33029.test

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

# Bug #36443 Server crashes when executing insert when insert trigger on table

#

# Emulating the former bug#33029 situation to see that there is no crash anymore.

# 





source include/master-slave.inc;



create table `t1` (`id` int not null auto_increment primary key);

create trigger `trg` before insert on `t1` for each row begin end;



sync_slave_with_master;

set @@global.debug="+d,simulate_bug33029";



stop slave;

start slave;



connection master;



insert into `t1` values ();



sync_slave_with_master;

select * from t1;