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/item.cc | |
| parent | fe7c2aaeeab289b09645748e2006a7a9409fbbfa (diff) | |
| download | mariadb-git-4923d19b7c3c4c034f70ac1411837afa75c4b6ad.tar.gz | |
small code cleanup taken from MySQL 5.6
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 216ef628271..5f4b34ea552 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5514,8 +5514,7 @@ String *Item::check_well_formed_result(String *str, bool send_error) cs->csname, hexbuf); return 0; } - if ((thd->variables.sql_mode & - (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES))) + if (thd->is_strict_mode()) { null_value= 1; str= 0; |