diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-01 20:49:58 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-01 20:49:58 +0100 |
| commit | f11b030e1728744d345dca708819eaee09f43a7c (patch) | |
| tree | ee51b952edd79fb74915ae3e49bee973f701a2a5 /sql/sql_class.h | |
| parent | 46bc8970c9b0afa3351cfacd58ce279b01c894dd (diff) | |
| parent | 29c7acd6d41c5a7515b3757f87aedfe08accfe46 (diff) | |
| download | mariadb-git-f11b030e1728744d345dca708819eaee09f43a7c.tar.gz | |
auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 22143eb1498..15aef33bcb3 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -428,6 +428,7 @@ typedef struct system_variables uint binlog_format; ///< binlog format for this thd (see enum_binlog_format) my_bool binlog_direct_non_trans_update; + my_bool sql_log_bin; uint completion_type; uint query_cache_type; uint tx_isolation; @@ -1672,8 +1673,6 @@ public: /* <> 0 if we are inside of trigger or stored function. */ uint in_sub_stmt; - /* TRUE when the current top has SQL_LOG_BIN ON */ - bool sql_log_bin_toplevel; /* container for handler's private per-connection data */ Ha_data ha_data[MAX_HA]; |