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/sp_head.cc | |
| parent | fe7c2aaeeab289b09645748e2006a7a9409fbbfa (diff) | |
| download | mariadb-git-4923d19b7c3c4c034f70ac1411837afa75c4b6ad.tar.gz | |
small code cleanup taken from MySQL 5.6
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index bde54ea2443..2ab5f96d4cb 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -385,9 +385,7 @@ sp_eval_expr(THD *thd, Field *result_field, Item **expr_item_ptr) */ thd->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL; - thd->abort_on_warning= - thd->variables.sql_mode & - (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES); + thd->abort_on_warning= thd->is_strict_mode(); thd->transaction.stmt.modified_non_trans_table= FALSE; /* Save the value in the field. Convert the value if needed. */ |