diff options
| author | unknown <gluh@mysql.com/eagle.(none)> | 2007-01-26 16:36:50 +0400 |
|---|---|---|
| committer | unknown <gluh@mysql.com/eagle.(none)> | 2007-01-26 16:36:50 +0400 |
| commit | 92a7c1ed9c6dec1fee17a830fdabe9272d6692bd (patch) | |
| tree | 12f96b03a54f9059b09f59ec88d49b0907ef0fb0 /sql/item.h | |
| parent | ea41474bf8c3051255dd0bf6ce72f4520b548976 (diff) | |
| parent | 24903ed56ca2cceb3b9cb9f690ab47cc95e072be (diff) | |
| download | mariadb-git-92a7c1ed9c6dec1fee17a830fdabe9272d6692bd.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.0
sql/item.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index c7c1218d3e9..6c41aa09f80 100644 --- a/sql/item.h +++ b/sql/item.h @@ -447,7 +447,8 @@ public: Item *next; uint32 max_length; uint name_length; /* Length of name */ - uint8 marker, decimals; + int8 marker; + uint8 decimals; my_bool maybe_null; /* If item may be null */ my_bool null_value; /* if item is null */ my_bool unsigned_flag; @@ -2263,6 +2264,9 @@ public: bool fix_fields(THD *, Item **); void print(String *str); table_map used_tables() const { return (table_map)0L; } + Field *get_tmp_table_field() { return 0; } + Item *copy_or_same(THD *thd) { return this; } + Item *get_tmp_table_item(THD *thd) { return copy_or_same(thd); } void cleanup(); private: |