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

Part 2: removed hack workaround for bug we do not have.
MariaDB · Oct 29, 2015 · 923827e · 923827e
1 parent fb4358f
commit 923827e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
@@ -626,8 +626,7 @@ String *Item_func_concat::val_str(String *str)
   if (!(res=args[0]->val_str(str)))
     goto null;
   use_as_buff= &tmp_value;
-  /* Item_subselect in --ps-protocol mode will state it as a non-const */
-  is_const= args[0]->const_item() || !args[0]->used_tables();
+  is_const= args[0]->const_item();
   for (i=1 ; i < arg_count ; i++)
   {
     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 
        evaluated only for it.
       */
-      is_const= args[i]->const_item() || !args[i]->used_tables();
+      is_const= args[i]->const_item();
     }
     else
     {
@@ -986,7 +985,7 @@ String *Item_func_concat_ws::val_str(String *str)
   for (i=1; i < arg_count; i++)
     if ((res= args[i]->val_str(str)))
     {
-      is_const= args[i]->const_item() || !args[i]->used_tables();
+      is_const= args[i]->const_item();
       break;
     }