Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

1 files changed, 1 insertions, 8 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 1b843b27203..0a9ca50a028 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -484,14 +484,7 @@ public:
     return item->walk(processor, walk_subquery, arg) ||
       Item_str_func::walk(processor, walk_subquery, arg);
   }
-  Item *transform(Item_transformer transformer, byte *arg)
-  {
-    Item *new_item= item->transform(transformer, arg);
-    if (!new_item)
-      return 0;
-    item= new_item;
-    return Item_str_func::transform(transformer, arg);
-  }
+  Item *transform(Item_transformer transformer, byte *arg);
   void print(String *str);
 };