diff options
author | Sinisa@sinisa.nasamreza.org <> | 2001-12-29 15:15:51 +0200 |
---|---|---|
committer | Sinisa@sinisa.nasamreza.org <> | 2001-12-29 15:15:51 +0200 |
commit | d82830c591942a21e72f55e76c7193ea1c56ecea (patch) | |
tree | e570d4c59b3a7727411fc9c0a6fe51a149353d6f /sql/item.h | |
parent | 1cef60bff682d765c53bc307e60797683a67d3d2 (diff) | |
download | mariadb-git-d82830c591942a21e72f55e76c7193ea1c56ecea.tar.gz |
Code that had to be changed so that CREATE ... SELECT ... always
creates proper column types, out of any function, expression or from
other tables.
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item.h b/sql/item.h index cd752710523..5028f25c6b8 100644 --- a/sql/item.h +++ b/sql/item.h @@ -64,7 +64,7 @@ public: virtual longlong val_int()=0; virtual String *val_str(String*)=0; virtual void make_field(Send_field *field)=0; - virtual Field *tmp_table_field() { return 0; } + virtual Field *tmp_table_field(TABLE *t_arg=(TABLE *)0) { return 0; } virtual const char *full_name() const { return name ? name : "???"; } virtual double val_result() { return val(); } virtual longlong val_int_result() { return val_int(); } @@ -128,7 +128,7 @@ public: { return field->result_type(); } - Field *tmp_table_field() { return result_field; } + Field *tmp_table_field(TABLE *t_arg=(TABLE *)0) { return result_field; } bool get_date(TIME *ltime,bool fuzzydate); bool get_time(TIME *ltime); bool is_null() { return field->is_null(); } @@ -308,7 +308,7 @@ public: Field *result_field; /* Save result here */ Item_result_field() :result_field(0) {} ~Item_result_field() {} /* Required with gcc 2.95 */ - Field *tmp_table_field() { return result_field; } + Field *tmp_table_field(TABLE *t_arg=(TABLE *)0) { return result_field; } table_map used_tables() const { return 1; } virtual void fix_length_and_dec()=0; }; |