diff options
| author | gkodinov/kgeorge@macbook.gmz <> | 2007-01-23 12:34:50 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@macbook.gmz <> | 2007-01-23 12:34:50 +0200 |
| commit | 17a0207ecee35c82e0a488b900d0e6279a596577 (patch) | |
| tree | ef50ee2680b393a9652b2c98dfe15de22de7f795 /sql/item.h | |
| parent | c9df1caac83eac107acb0acfecf3b0a950e7ffa5 (diff) | |
| parent | 884713fb08418ae819ba39a5429a3dd18586c423 (diff) | |
| download | mariadb-git-17a0207ecee35c82e0a488b900d0e6279a596577.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
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 c962e36aa2b..7100cf9a997 100644 --- a/sql/item.h +++ b/sql/item.h @@ -482,7 +482,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; @@ -2373,6 +2374,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: |