diff options
| author | unknown <bar@mysql.com> | 2006-03-01 17:58:01 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-01 17:58:01 +0400 |
| commit | c64c108eda29fbcb397a694056708261f2891916 (patch) | |
| tree | 555d6d5bd61ca7008cffa4a2624c3fe72148fd8e /sql/item.cc | |
| parent | a7abbd918ba952e2f387cec28ed0f74997b14975 (diff) | |
| download | mariadb-git-c64c108eda29fbcb397a694056708261f2891916.tar.gz | |
Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
union.result, union.test:
Adding test case.
item.cc:
Allow safe character set conversion in UNION
- string constant to column's charset
- to unicode
Thus, UNION now works the same with CONCAT (and other string functions)
in respect of aggregating arguments with different character sets.
sql/item.cc:
Allow character set conversion in UNION
- string to column's charset
- to unicode
Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
mysql-test/t/union.test:
Adding test case.
mysql-test/r/union.result:
Adding test case.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index f996e962cca..5964ed388c6 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3258,7 +3258,7 @@ bool Item_type_holder::join_types(THD *thd, Item *item) const char *old_cs, *old_derivation; old_cs= collation.collation->name; old_derivation= collation.derivation_name(); - if (collation.aggregate(item->collation)) + if (collation.aggregate(item->collation, MY_COLL_ALLOW_CONV)) { my_error(ER_CANT_AGGREGATE_2COLLATIONS, MYF(0), old_cs, old_derivation, |