diff options
| author | unknown <gluh@eagle.(none)> | 2007-01-26 16:46:01 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-01-26 16:46:01 +0400 |
| commit | 33b73c200f57d50cf6502cfdf48d860f01ae83b2 (patch) | |
| tree | 0d0331efb0feab8a0b10a3440ef0861ee20d3e0e /sql/item.h | |
| parent | 8b2d01336415c59f7d1912a6f36adf194955a986 (diff) | |
| parent | 4d7994ad683b06ee08f30c2efb34b8dcb297ad97 (diff) | |
| download | mariadb-git-33b73c200f57d50cf6502cfdf48d860f01ae83b2.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1
mysql-test/r/view.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
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 b2e363dce52..2ab716872f0 100644 --- a/sql/item.h +++ b/sql/item.h @@ -477,7 +477,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; @@ -2367,6 +2368,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: |