diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-12-16 21:45:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-12-16 21:45:45 +0100 |
| commit | 4923d19b7c3c4c034f70ac1411837afa75c4b6ad (patch) | |
| tree | e0442afcdf15886e0b192fd33125b56d45b8cdc4 /sql/sql_update.cc | |
| parent | fe7c2aaeeab289b09645748e2006a7a9409fbbfa (diff) | |
| download | mariadb-git-4923d19b7c3c4c034f70ac1411837afa75c4b6ad.tar.gz | |
small code cleanup taken from MySQL 5.6
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index c131db1bffc..42e2eb6cbfd 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -643,10 +643,7 @@ int mysql_update(THD *thd, THD_STAGE_INFO(thd, stage_updating); transactional_table= table->file->has_transactions(); - thd->abort_on_warning= test(!ignore && - (thd->variables.sql_mode & - (MODE_STRICT_TRANS_TABLES | - MODE_STRICT_ALL_TABLES))); + thd->abort_on_warning= !ignore && thd->is_strict_mode(); if (table->triggers && table->triggers->has_triggers(TRG_EVENT_UPDATE, TRG_ACTION_AFTER)) @@ -1391,9 +1388,7 @@ bool mysql_multi_update(THD *thd, DBUG_RETURN(TRUE); } - thd->abort_on_warning= test(thd->variables.sql_mode & - (MODE_STRICT_TRANS_TABLES | - MODE_STRICT_ALL_TABLES)); + thd->abort_on_warning= thd->is_strict_mode(); List<Item> total_list; |