database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source
This commit is contained in:
jimw@mysql.com
2004-12-03 02:44:33 +01:00
parent 4b8e96d5ca
commit 08f771a0cc
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.h
View File

@ -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 tmp_disable_binlog(A) \
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