mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-7949: Item_field::used_tables() takes 0.29% in OLTP RO

Browse source 
Part 2: removed hack workaround for bug we do not have.
This commit is contained in:
Oleksandr Byelkin 2015-05-17 15:10:45 +02:00
commit 923827e2cc
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/item_strfunc.cc
View file

@ -626,8 +626,7 @@ String *Item_func_concat::val_str(String *str)
if (!(res=args[0]->val_str(str))) if (!(res=args[0]->val_str(str)))
goto null; goto null;
use_as_buff= &tmp_value; use_as_buff= &tmp_value;
/* Item_subselect in --ps-protocol mode will state it as a non-const */ is_const= args[0]->const_item();
is_const= args[0]->const_item() || !args[0]->used_tables();
for (i=1 ; i < arg_count ; i++) for (i=1 ; i < arg_count ; i++)
{ {
if (res->length() == 0) if (res->length() == 0)
@ -639,7 +638,7 @@ String *Item_func_concat::val_str(String *str)
non-empty argument. Because of this we need is_const to be non-empty argument. Because of this we need is_const to be
evaluated only for it. evaluated only for it.
*/ */
is_const= args[i]->const_item() || !args[i]->used_tables(); is_const= args[i]->const_item();
} }
else else
{ {
@ -986,7 +985,7 @@ String *Item_func_concat_ws::val_str(String *str)
for (i=1; i < arg_count; i++) for (i=1; i < arg_count; i++)
if ((res= args[i]->val_str(str))) if ((res= args[i]->val_str(str)))
{ {
is_const= args[i]->const_item() || !args[i]->used_tables(); is_const= args[i]->const_item();
break; break;
} }