MDEV-7635: SET shouldn't fail for invalid values in strict trans mode

Nirbhay Choubey · Nirbhay Choubey · commit f556aa9b5f36 · 2017-02-10T06:30:42.000-05:00
diff --git a/sql/set_var.cc b/sql/set_var.cc
@@ -464,7 +464,7 @@ bool throw_bounds_warning(THD *thd, const char *name,
     else
       llstr(v, buf);
 
-    if (thd->is_strict_mode())
+    if (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)
     {
       my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf);
       return true;
@@ -484,7 +484,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->is_strict_mode())
+    if (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)
     {
       my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf);
       return true;

Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ bool throw_bounds_warning(THD thd, const char name,`
`464`	`464`	`else`
`465`	`465`	`llstr(v, buf);`
`466`	`466`
`467`		`- if (thd->is_strict_mode())`
	`467`	`+ if (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)`
`468`	`468`	`{`
`469`	`469`	`my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf);`
`470`	`470`	`return true;`
`@@ -484,7 +484,7 @@ bool throw_bounds_warning(THD thd, const char name, bool fixed, double v)`
`484`	`484`
`485`	`485`	`my_gcvt(v, MY_GCVT_ARG_DOUBLE, sizeof(buf) - 1, buf, NULL);`
`486`	`486`
`487`		`- if (thd->is_strict_mode())`
	`487`	`+ if (thd->variables.sql_mode & MODE_STRICT_ALL_TABLES)`
`488`	`488`	`{`
`489`	`489`	`my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buf);`
`490`	`490`	`return true;`