diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /sql/item_row.h | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'sql/item_row.h')
| -rw-r--r-- | sql/item_row.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index 87988e718ca..63028e3bd7d 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -63,6 +63,7 @@ public: return 0; }; bool fix_fields(THD *thd, Item **ref); + void fix_after_pullout(st_select_lex *new_parent, Item **ref); void cleanup(); void split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields); table_map used_tables() const { return used_tables_cache; }; @@ -81,6 +82,7 @@ public: bool check_cols(uint c); bool null_inside() { return with_null; }; void bring_value(); + bool check_vcol_func_processor(uchar *int_arg) {return FALSE; } }; #endif /* ITEM_ROW_INCLUDED */ |