summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-09-25 21:33:50 +0400
committerAlexander Barkov <bar@mariadb.org>2015-09-25 21:33:50 +0400
commit30711c6650fc7e2f166f29d0bc59eeab64dadb3e (patch)
treebd9a209f1e339c73a2d23c22c9c078ea992ebd08 /sql/item_sum.cc
parent26e4403f649839e82dd26f7a6b31165063eb2871 (diff)
downloadmariadb-git-30711c6650fc7e2f166f29d0bc59eeab64dadb3e.tar.gz
MDEV-8806 Numeric CAST produce different warnings for strings literals vs functions
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 1a97a086a16..a52c4d783f2 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -912,7 +912,7 @@ bool Aggregator_distinct::setup(THD *thd)
arg= item_sum->get_arg(0);
if (arg->const_item())
{
- (void) arg->val_int();
+ (void) arg->is_null();
if (arg->null_value)
always_null= true;
}