diff options
| author | Dmitry Shulga <dmitry.shulga@mariadb.com> | 2022-12-09 11:50:05 +0700 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-01-02 00:04:03 +0100 |
| commit | a9b31b0814b02e65930209b1a90a8293b2ca6619 (patch) | |
| tree | ea6916ec10fdf47d814bd58f529ca0fd2606582a /sql/item_cmpfunc.cc | |
| parent | 8760f6907c51e0e20242a53188be5b62029d6f1a (diff) | |
| download | mariadb-git-a9b31b0814b02e65930209b1a90a8293b2ca6619.tar.gz | |
MDEV-29988: (revert) Major performance regression with 10.6.11
Reverted changed in server code introduced by
the commit bd9274faa469cc164099c7497c18a0e0a9b1184b.
Tests from this commit are retained.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index b7b0c981c2d..fe6b8feb4de 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -442,18 +442,9 @@ bool Item_func::setup_args_and_comparator(THD *thd, Arg_comparator *cmp) if (args[0]->cmp_type() == STRING_RESULT && args[1]->cmp_type() == STRING_RESULT) { - Query_arena *arena, backup; - arena= thd->activate_stmt_arena_if_needed(&backup); - DTCollation tmp; - bool ret= agg_arg_charsets_for_comparison(tmp, args, 2); - - if (arena) - thd->restore_active_arena(arena, &backup); - - if (ret) - return ret; - + if (agg_arg_charsets_for_comparison(tmp, args, 2)) + return true; cmp->m_compare_collation= tmp.collation; } // Convert constants when compared to int/year field |