diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-23 20:49:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-23 20:49:31 +0200 |
| commit | c93405b7153df01362f9869bac7c2e305dd06af9 (patch) | |
| tree | 8043dec44994d714d28873d30d15e81ef3f040e7 /sql/item_cmpfunc.h | |
| parent | be21a113da9748d06739b6522ea898257970b1c5 (diff) | |
| parent | 8637931f118b53ff6fdadf6006ccdb8dedd6f732 (diff) | |
| download | mariadb-git-10.0-merge.tar.gz | |
WIP Merge 5.5 into bb-10.0-vicentiu10.0-merge
Unresolved conflicts:
both modified: sql/item_cmpfunc.cc
both modified: sql/item_cmpfunc.h
both modified: sql/sql_partition.cc
both modified: storage/tokudb/CMakeLists.txt
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index fc906fd63d8..56332c792de 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -272,9 +272,15 @@ public: virtual void get_cache_parameters(List<Item> ¶meters); bool is_top_level_item(); bool eval_not_null_tables(uchar *opt_arg); +<<<<<<< HEAD void fix_after_pullout(st_select_lex *new_parent, Item **ref, bool merge); bool invisible_mode(); void reset_cache() { cache= NULL; } +======= + void fix_after_pullout(st_select_lex *new_parent, Item **ref); + virtual void print(String *str, enum_query_type query_type); + void restore_first_argumet(); +>>>>>>> origin/5.5 }; class Comp_creator |