diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-06-23 18:30:59 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-06-23 18:30:59 +0300 |
| commit | fcf434311471dfce73cbb0275ab700cd3a86d780 (patch) | |
| tree | e20c09b8f1c6cf111338978f646efd702f26c528 /sql/sql_class.h | |
| parent | 5ae3967c878ac7cfb8475eeeb50c2ebd81f39cf6 (diff) | |
| parent | a5e742fedd4324d29867a15a6cabb54959108fbb (diff) | |
| download | mariadb-git-fcf434311471dfce73cbb0275ab700cd3a86d780.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index a635a126f84..31cc38fd8c5 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1420,10 +1420,10 @@ public: }; #define tmp_disable_binlog(A) \ - ulong save_options= (A)->options; \ - (A)->options&= ~OPTION_BIN_LOG; + {ulong tmp_disable_binlog__save_options= (A)->options; \ + (A)->options&= ~OPTION_BIN_LOG -#define reenable_binlog(A) (A)->options= save_options; +#define reenable_binlog(A) (A)->options= tmp_disable_binlog__save_options;} /* Flags for the THD::system_thread (bitmap) variable */ #define SYSTEM_THREAD_DELAYED_INSERT 1 |