diff options
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item.h b/sql/item.h index 8faba4ddcb5..5b96e93dd1f 100644 --- a/sql/item.h +++ b/sql/item.h @@ -677,7 +677,7 @@ public: calls. */ uint name_length; /* Length of name */ - int8 marker; + int marker; bool maybe_null; /* If item may be null */ bool in_rollup; /* If used in GROUP BY list of a query with ROLLUP */ @@ -3599,6 +3599,7 @@ class Item_ref :public Item_ident { protected: void set_properties(); + bool set_properties_only; // the item doesn't need full fix_fields public: enum Ref_Type { REF, DIRECT_REF, VIEW_REF, OUTER_REF, AGGREGATE_REF }; Item **ref; @@ -3607,7 +3608,7 @@ public: const char *db_arg, const char *table_name_arg, const char *field_name_arg): Item_ident(thd, context_arg, db_arg, table_name_arg, field_name_arg), - ref(0), reference_trough_name(1) {} + set_properties_only(0), ref(0), reference_trough_name(1) {} /* This constructor is used in two scenarios: A) *item = NULL @@ -3630,7 +3631,7 @@ public: /* Constructor need to process subselect with temporary tables (see Item) */ Item_ref(THD *thd, Item_ref *item) - :Item_ident(thd, item), ref(item->ref) {} + :Item_ident(thd, item), set_properties_only(0), ref(item->ref) {} enum Type type() const { return REF_ITEM; } enum Type real_type() const { return ref ? (*ref)->type() : REF_ITEM; } |