summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h
index db8398936fd..b5e3c14be43 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -5349,9 +5349,9 @@ public:
tmp.derivation == DERIVATION_NONE)
{
my_error(ER_CANT_AGGREGATE_2COLLATIONS,MYF(0),
- (*a)->collation.collation->name,
+ (*a)->collation.collation->coll_name.str,
(*a)->collation.derivation_name(),
- (*b)->collation.collation->name,
+ (*b)->collation.collation->coll_name.str,
(*b)->collation.derivation_name(),
func_name());
return true;