diff options
| author | unknown <serg@serg.mylan> | 2005-03-14 14:47:51 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-14 14:47:51 +0100 |
| commit | ebbee9d974a37ce9fad0a2b67152cbc412a58067 (patch) | |
| tree | f9212bc6a4dc14f47bfce79ca07320ec3d810728 /sql/item_cmpfunc.h | |
| parent | 1c234737515106342180daa9671de15dedd48fcc (diff) | |
| parent | 87b40f2013a108ed3caaf6912772354d0b0dc842 (diff) | |
| download | mariadb-git-ebbee9d974a37ce9fad0a2b67152cbc412a58067.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 63e7a93d43a..02bbb00f293 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1237,6 +1237,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; } }; |