database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing.merge

Browse Source
This commit is contained in:
Alfranio Correia
2010-06-01 14:49:31 +01:00
parent ff6cf4bb46 8357596035
commit c54aabc93b
10 changed files with 402 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@@ -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) ||