summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-12-16 21:45:45 +0100
committerSergei Golubchik <sergii@pisem.net>2012-12-16 21:45:45 +0100
commit4923d19b7c3c4c034f70ac1411837afa75c4b6ad (patch)
treee0442afcdf15886e0b192fd33125b56d45b8cdc4 /sql/set_var.cc
parentfe7c2aaeeab289b09645748e2006a7a9409fbbfa (diff)
downloadmariadb-git-4923d19b7c3c4c034f70ac1411837afa75c4b6ad.tar.gz
small code cleanup taken from MySQL 5.6
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index bf18ca49b37..be624351731 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -311,7 +311,7 @@ bool throw_bounds_warning(THD *thd, const char *name,
else
llstr(v, buf);
- if (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)
+ if (thd->is_strict_mode())
{
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf);
return true;
@@ -331,7 +331,7 @@ bool throw_bounds_warning(THD *thd, const char *name, bool fixed, double v)
my_gcvt(v, MY_GCVT_ARG_DOUBLE, sizeof(buf) - 1, buf, NULL);
- if (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)
+ if (thd->is_strict_mode())
{
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf);
return true;