summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2012-05-11 11:40:23 +0300
committerunknown <sanja@montyprogram.com>2012-05-11 11:40:23 +0300
commite10fecc02f57980ddc27bafb9d1f620e8533f4a3 (patch)
tree393865dac63fb0c44cd7c6d166c97a4617b1a313 /sql/item_cmpfunc.h
parentfe0a0bdb143696c54206cd5f908dac94996aab42 (diff)
parentf2cbc014d98a927ed7038f55a25c3d288de10f51 (diff)
downloadmariadb-git-e10fecc02f57980ddc27bafb9d1f620e8533f4a3.tar.gz
Merge 5.2->5.3
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r--sql/item_cmpfunc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 189b83b7efc..45a0976fae1 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -247,6 +247,7 @@ public:
{}
bool fix_fields(THD *, Item **);
bool fix_left(THD *thd, Item **ref);
+ table_map not_null_tables() const { return 0; }
bool is_null();
longlong val_int();
void cleanup();
@@ -498,6 +499,7 @@ public:
{}
virtual void top_level_item() { abort_on_null= 1; }
bool is_top_level_item() { return abort_on_null; }
+ table_map not_null_tables() const { return 0; }
longlong val_int();
enum Functype functype() const { return NOT_ALL_FUNC; }
const char *func_name() const { return "<not>"; }