diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-06-22 14:48:29 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-06-22 14:48:29 +0500 |
| commit | 5e7260ab4fccead72ea03fcfc55de9f17fb0b5aa (patch) | |
| tree | 36532eeacfa72a177f65dae129bd2c90c0aaa771 /sql/item.h | |
| parent | 3da21e1c3e7ba6e5b45bbd196c3bb02513bcc04f (diff) | |
| parent | 8000e4134c4b72225dfdb68896ff1cec01842c24 (diff) | |
| download | mariadb-git-5e7260ab4fccead72ea03fcfc55de9f17fb0b5aa.tar.gz | |
after merge fix
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 52a44a65526..fe8c2cb0df1 100644 --- a/sql/item.h +++ b/sql/item.h @@ -822,7 +822,10 @@ public: void save_org_in_field(Field *field) { (*ref)->save_org_in_field(field); } enum Item_result result_type () const { return (*ref)->result_type(); } enum_field_types field_type() const { return (*ref)->field_type(); } - table_map used_tables() const { return (*ref)->used_tables(); } + table_map used_tables() const + { + return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables(); + } void set_result_field(Field *field) { result_field= field; } bool is_result_field() { return 1; } void save_in_result_field(bool no_conversions) |