Commit 8948b745 authored by unknown's avatar unknown
Browse files

Manual fixes to merge of fix for Bug #6682 to 4.1. 


sql/sql_class.h:
  update tmp_disable_binlog() and reenable_binlog() macros
mysql-test/r/insert_select.result:
  Handle results that differ from 4.0 to 4.1
parent 117c7611

mysql-test/r/insert_select.result

+2 −2
Original line number Diff line number Diff line
@@ -85,10 +85,10 @@ create table t1(a int); 
insert into t1 values(1),(1);

reset master;

create table t2(unique(a)) select a from t1;

Duplicate entry '1' for key 1

ERROR 23000: Duplicate entry '1' for key 1

show binlog events;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3

master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3

drop table t1;

create table t1 (a int not null);

create table t2 (a int not null);

sql/sql_class.h

+5 −8
Original line number Diff line number Diff line
@@ -1093,13 +1093,10 @@ class THD :public ilink, 
};



#define tmp_disable_binlog(A)       \

  ulong save_options= (A)->options, save_master_access= (A)->master_access; \

  (A)->options&= ~OPTION_BIN_LOG;                                       \

  (A)->master_access|= SUPER_ACL; /* unneeded in 4.1 */                 

  ulong save_options= (A)->options; \

  (A)->options&= ~OPTION_BIN_LOG;



#define reenable_binlog(A)                      \

  (A)->options= save_options;                   \

  (A)->master_access= save_master_access;       

#define reenable_binlog(A)          (A)->options= save_options;



/* Flags for the THD::system_thread (bitmap) variable */

#define SYSTEM_THREAD_DELAYED_INSERT 1