Commit 32659db8 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru

Fix merge error from 10.0

Item_func_sysconst behaves as a non-constant function during prepared
statements and view creation and constant otherwise. Current condition
implied the opposite.
parent 2e335a47
...@@ -2339,7 +2339,7 @@ Item *Item_func_sysconst::safe_charset_converter(THD *thd, CHARSET_INFO *tocs) ...@@ -2339,7 +2339,7 @@ Item *Item_func_sysconst::safe_charset_converter(THD *thd, CHARSET_INFO *tocs)
Return the identical item during view creation and prepare. Return the identical item during view creation and prepare.
*/ */
if (!thd->lex->is_ps_or_view_context_analysis()) if (thd->lex->is_ps_or_view_context_analysis())
return this; return this;
return const_charset_converter(thd, tocs, true, fully_qualified_func_name()); return const_charset_converter(thd, tocs, true, fully_qualified_func_name());
} }
......
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