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_base.cc | |
| 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_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 1e537112d01..325f054db02 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4007,9 +4007,9 @@ thr_lock_type read_lock_type_for_table(THD *thd, prelocked mode we can't rely on OPTION_BIN_LOG flag in THD::options bitmap to determine that binary logging is turned on as this bit can be cleared before executing sub-statement. So instead we have to look - at THD::sql_log_bin_toplevel member. + at THD::variables::sql_log_bin member. */ - bool log_on= mysql_bin_log.is_open() && thd->sql_log_bin_toplevel; + bool log_on= mysql_bin_log.is_open() && thd->variables.sql_log_bin; ulong binlog_format= thd->variables.binlog_format; if ((log_on == FALSE) || (binlog_format == BINLOG_FORMAT_ROW) || (table_list->table->s->table_category == TABLE_CATEGORY_LOG) || |