Commit 8235311d authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 94cde5ee 7fda1ab9

mysql-test/t/rpl000012.test

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ insert into t2 select * from t1; 
drop table if exists test.t3;

create temporary table test.t3 (n int not null);

alter table test.t3 add primary key(n);

flush logs;

insert into t3 values (100);

insert into t2 select * from t3;

drop table if exists test.t3;

sql/slave.cc

+0 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,6 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
    }



    case START_EVENT:

      close_temporary_tables(thd);

      mi->inc_pos(event_len);

      flush_master_info(mi);

      delete ev;