diff options
author | timour@mysql.com <> | 2006-04-04 14:35:17 +0300 |
---|---|---|
committer | timour@mysql.com <> | 2006-04-04 14:35:17 +0300 |
commit | 51476082b740653c7fd186825744e1c40296e066 (patch) | |
tree | cb10183b7c926693a43a81d41bf8e91d833c3f14 /sql/item.h | |
parent | 679dbc7627f156c6444222c1d9e2a8f6817cfbdc (diff) | |
parent | b85bd1e835f57deec6284dec52db38bf1ed498d7 (diff) | |
download | mariadb-git-51476082b740653c7fd186825744e1c40296e066.tar.gz |
Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge
into mysql.com:/home/timka/mysql/src/5.1-merge
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index b9ce418858c..6c7a0976df1 100644 --- a/sql/item.h +++ b/sql/item.h @@ -741,6 +741,7 @@ public: virtual bool remove_fixed(byte * arg) { fixed= 0; return 0; } virtual bool cleanup_processor(byte *arg); virtual bool collect_item_field_processor(byte * arg) { return 0; } + virtual bool find_item_in_field_list_processor(byte *arg) { return 0; } virtual bool change_context_processor(byte *context) { return 0; } virtual bool reset_query_id_processor(byte *query_id) { return 0; } @@ -1193,6 +1194,7 @@ public: bool is_null() { return field->is_null(); } Item *get_tmp_table_item(THD *thd); bool collect_item_field_processor(byte * arg); + bool find_item_in_field_list_processor(byte *arg); bool reset_query_id_processor(byte *arg) { field->query_id= *((query_id_t *) arg); |