summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 89eb155bc63..9208cf2eddd 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1522,7 +1522,7 @@ int set_var::check(THD *thd)
return 0;
}
- if (value->check_cols(1) || value->fix_fields(thd, 0, &value))
+ if (value->fix_fields(thd, 0, &value) || value->check_cols(1))
return -1;
if (var->check_update_type(value->result_type()))
{