diff options
| author | unknown <jimw@mysql.com> | 2004-12-03 02:44:33 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2004-12-03 02:44:33 +0100 |
| commit | 8948b7450fa543ef14f29b6087fd70ccfa640972 (patch) | |
| tree | 286a6f113bd76ec5b986c2528ab6d942c3e395b5 /sql/sql_class.h | |
| parent | 117c7611a74ec27cf2f136b14155d29880613c74 (diff) | |
| download | mariadb-git-8948b7450fa543ef14f29b6087fd70ccfa640972.tar.gz | |
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
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 4e695701310..eaddca7b7d8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1092,14 +1092,11 @@ public: void end_statement(); }; -# 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 */ - -#define reenable_binlog(A) \ - (A)->options= save_options; \ - (A)->master_access= save_master_access; +#define tmp_disable_binlog(A) \ + ulong save_options= (A)->options; \ + (A)->options&= ~OPTION_BIN_LOG; + +#define reenable_binlog(A) (A)->options= save_options; /* Flags for the THD::system_thread (bitmap) variable */ #define SYSTEM_THREAD_DELAYED_INSERT 1 |