diff options
| author | unknown <sanja@hasky.mysql.fi> | 2005-08-13 08:19:34 +0300 |
|---|---|---|
| committer | unknown <sanja@hasky.mysql.fi> | 2005-08-13 08:19:34 +0300 |
| commit | ad888850c0f7b754a31e58c5a6ad37cb62180716 (patch) | |
| tree | 94c0a5c04e93056120573588429361768a4daf0b /sql/item.h | |
| parent | d32c4314ed5935e7a03f443e3f26bae47e572600 (diff) | |
| parent | e8d9dccb3dd98dfd7973a94d1eafc0b100101deb (diff) | |
| download | mariadb-git-ad888850c0f7b754a31e58c5a6ad37cb62180716.tar.gz | |
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into hasky.mysql.fi:/home/sanja/work-merge-5.0
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/item_subselect.cc:
merge
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index a72156c9315..ae5fbe5a44b 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1587,6 +1587,15 @@ public: bool val_bool(); bool get_date(TIME *ltime, uint fuzzydate); void print(String *str); + /* + we add RAND_TABLE_BIT to prevent moving this item from HAVING to WHERE + */ + table_map used_tables() const + { + return (depended_from ? + OUTER_REF_TABLE_BIT : + (*ref)->used_tables() | RAND_TABLE_BIT); + } }; class Item_null_helper :public Item_ref_null_helper |