summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2016-03-22 00:09:04 +0400
committerAlexander Barkov <bar@mariadb.org>2016-03-22 00:09:04 +0400
commit537fc572d451888d26c26d3e89c3237d1213be4d (patch)
treed72e910428039b1b1cdaf2bc511a2bc08ed7c236 /sql/set_var.cc
parente8af217e16837000b8a3809e9fa48a5e75088cd0 (diff)
downloadmariadb-git-537fc572d451888d26c26d3e89c3237d1213be4d.tar.gz
MDEV-9516 type error when setting session variable
Allowing assigning of DECIMAL(N,0) values to INT-alike system variables.
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 18f6cbc41fd..b5430c56865 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -739,7 +739,7 @@ int set_var::check(THD *thd)
if ((!value->fixed &&
value->fix_fields(thd, &value)) || value->check_cols(1))
return -1;
- if (var->check_update_type(value->result_type()))
+ if (var->check_update_type(value))
{
my_error(ER_WRONG_TYPE_FOR_VAR, MYF(0), var->name.str);
return -1;