diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 15:21:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 15:21:43 +0300 |
| commit | 9d0ee2dcb72c011b4ee73c578cc32b666297ca31 (patch) | |
| tree | 87992f23022a4fdd0e722ced5388e0fe0ea1a5e9 /sql/item.cc | |
| parent | 78efa1093076307946873f322b45a14d1ed5ffb0 (diff) | |
| parent | 4c19227929b0d86616337585fb95a4bb8fe0d4b2 (diff) | |
| download | mariadb-git-9d0ee2dcb72c011b4ee73c578cc32b666297ca31.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index e001178f8b6..994d45a9dc3 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2332,8 +2332,6 @@ bool Item_func_or_sum::agg_item_set_converter(const DTCollation &coll, Item* conv= (*arg)->safe_charset_converter(thd, coll.collation); if (conv == *arg) continue; - if (!conv && ((*arg)->collation.repertoire == MY_REPERTOIRE_ASCII)) - conv= new (thd->mem_root) Item_func_conv_charset(thd, *arg, coll.collation, 1); if (!conv) { |