diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
| commit | 0ce6d93f858eb5b67f8988946274ab2b9f060de4 (patch) | |
| tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /sql/sql_insert.cc | |
| parent | c2fe19883e624ddd0e37768f860fa0853848adb3 (diff) | |
| parent | e698ae01128fde4f82d4595e67a72cfac09ca125 (diff) | |
| download | mariadb-git-0ce6d93f858eb5b67f8988946274ab2b9f060de4.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1a071899d13..2cb873c823d 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -456,7 +456,7 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type, return; } - bool log_on= (thd->options & OPTION_BIN_LOG || + bool log_on= (thd->variables.option_bits & OPTION_BIN_LOG || ! (thd->security_ctx->master_access & SUPER_ACL)); if (global_system_variables.binlog_format == BINLOG_FORMAT_STMT && log_on && mysql_bin_log.is_open() && is_multi_insert) @@ -608,7 +608,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, By default, both logs are enabled (this won't cause problems if the server runs without --log-update or --log-bin). */ - bool log_on= ((thd->options & OPTION_BIN_LOG) || + bool log_on= ((thd->variables.option_bits & OPTION_BIN_LOG) || (!(thd->security_ctx->master_access & SUPER_ACL))); #endif thr_lock_type lock_type; @@ -987,7 +987,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, if (error) goto abort; - if (values_list.elements == 1 && (!(thd->options & OPTION_WARNINGS) || + if (values_list.elements == 1 && (!(thd->variables.option_bits & OPTION_WARNINGS) || !thd->cuted_fields)) { thd->row_count_func= info.copied + info.deleted + |