Commit bbd88314 authored by unknown's avatar unknown

Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql

parents 928963f6 4af3c668
...@@ -9,6 +9,7 @@ insert into t2 select * from t1; ...@@ -9,6 +9,7 @@ insert into t2 select * from t1;
drop table if exists test.t3; drop table if exists test.t3;
create temporary table test.t3 (n int not null); create temporary table test.t3 (n int not null);
alter table test.t3 add primary key(n); alter table test.t3 add primary key(n);
flush logs;
insert into t3 values (100); insert into t3 values (100);
insert into t2 select * from t3; insert into t2 select * from t3;
drop table if exists test.t3; drop table if exists test.t3;
......
...@@ -1104,7 +1104,6 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) ...@@ -1104,7 +1104,6 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
} }
case START_EVENT: case START_EVENT:
close_temporary_tables(thd);
mi->inc_pos(event_len); mi->inc_pos(event_len);
flush_master_info(mi); flush_master_info(mi);
delete ev; delete ev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment