summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2014-07-28 12:47:14 +0400
committerAlexander Barkov <bar@mariadb.org>2014-07-28 12:47:14 +0400
commitc57c5be12a2d7d066cc508043da87cf51eb75cd3 (patch)
tree81ce5bfa4ad9ba30fb3235316f3a4a2da9013c83 /sql/item.cc
parent01faff02fab4ca2fe2193fee5016bf3f24e9aea1 (diff)
downloadmariadb-git-c57c5be12a2d7d066cc508043da87cf51eb75cd3.tar.gz
MDEV-5745 analyze MySQL fix for bug#12368495
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index b4d7bffae7b..d58e4d285c5 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -2074,7 +2074,7 @@ bool agg_item_collations(DTCollation &c, const char *fname,
bool unknown_cs= 0;
c.set(av[0]->collation);
- for (i= 1, arg= &av[item_sep]; i < count; i++, arg++)
+ for (i= 1, arg= &av[item_sep]; i < count; i++, arg+= item_sep)
{
if (c.aggregate((*arg)->collation, flags))
{