Manual merge

sql/item_cmpfunc.h:
  Auto merged
This commit is contained in:
unknown 2005-03-13 00:40:55 -08:00
commit 7bf4a418cb
3 changed files with 42 additions and 6 deletions

View file

@ -1234,6 +1234,7 @@ public:
enum Type type() const { return FUNC_ITEM; }
longlong val_int();
const char *func_name() const { return "xor"; }
table_map not_null_tables() const { return and_tables_cache; }
};