diff options
author | unknown <igor@rurik.mysql.com> | 2004-10-09 10:34:13 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2004-10-09 10:34:13 -0700 |
commit | 881534fb80cc7a017d180734a21a10b3e46aecba (patch) | |
tree | 84324c7af32f54d423310e3a2ee3255f7f43749b /sql/item_strfunc.h | |
parent | 79f1eeb87ff8047d1d09578f41c604bf5e31f29b (diff) | |
parent | 75fec5bdc3e9e5f0a4018c7dbf6371f0b4c5d14f (diff) | |
download | mariadb-git-881534fb80cc7a017d180734a21a10b3e46aecba.tar.gz |
Merge for Item_equal.
BitKeeper/etc/ignore:
auto-union
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_list.h:
Auto merged
mysql-test/r/func_test.result:
Post-automerge resolution of conflicts
mysql-test/r/index_merge.result:
Post-automerge resolution of conflicts
mysql-test/r/join_outer.result:
Post-automerge resolution of conflicts
mysql-test/r/range.result:
Post-automerge resolution of conflicts
mysql-test/r/subselect.result:
Post-automerge resolution of conflicts
sql/item.cc:
Post-automerge resolution of conflicts
sql/item.h:
Post-automerge resolution of conflicts
sql/item_cmpfunc.cc:
Post-automerge resolution of conflicts
sql/item_cmpfunc.h:
Post-automerge resolution of conflicts
sql/opt_range.cc:
Post-automerge resolution of conflicts
sql/sql_select.cc:
Post-automerge resolution of conflicts
sql/sql_select.h:
Post-automerge resolution of conflicts
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 111f0e20698..357ce0af45a 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -428,6 +428,14 @@ public: return item->walk(processor, arg) || Item_str_func::walk(processor, 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); + } void print(String *str); }; |