Commit a9b31b08 authored by Dmitry Shulga's avatar Dmitry Shulga Committed by Sergei Golubchik

MDEV-29988: (revert) Major performance regression with 10.6.11

Reverted changed in server code introduced by
the commit bd9274fa.
Tests from this commit are retained.
parent 8760f690
...@@ -442,18 +442,9 @@ bool Item_func::setup_args_and_comparator(THD *thd, Arg_comparator *cmp) ...@@ -442,18 +442,9 @@ bool Item_func::setup_args_and_comparator(THD *thd, Arg_comparator *cmp)
if (args[0]->cmp_type() == STRING_RESULT && if (args[0]->cmp_type() == STRING_RESULT &&
args[1]->cmp_type() == STRING_RESULT) args[1]->cmp_type() == STRING_RESULT)
{ {
Query_arena *arena, backup;
arena= thd->activate_stmt_arena_if_needed(&backup);
DTCollation tmp; DTCollation tmp;
bool ret= agg_arg_charsets_for_comparison(tmp, args, 2); if (agg_arg_charsets_for_comparison(tmp, args, 2))
return true;
if (arena)
thd->restore_active_arena(arena, &backup);
if (ret)
return ret;
cmp->m_compare_collation= tmp.collation; cmp->m_compare_collation= tmp.collation;
} }
// Convert constants when compared to int/year field // Convert constants when compared to int/year field
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment