diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-29 16:24:03 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-29 16:24:03 +0300 |
| commit | 4ca3bee9e56352638523f14fd0d208c7c60177bb (patch) | |
| tree | 16765dc270eb73603bfdf636b554686705d2601d /sql/item.h | |
| parent | f5558db162f1a655c24ce8d3fe784105bca35f4f (diff) | |
| download | mariadb-git-4ca3bee9e56352638523f14fd0d208c7c60177bb.tar.gz | |
tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)
sql/item_timefunc.h:
no need redefine tmp_table_field(), it will be inherited
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 07be964092a..c7eb7fc2c1b 100644 --- a/sql/item.h +++ b/sql/item.h @@ -140,7 +140,7 @@ public: virtual double val()=0; virtual longlong val_int()=0; virtual String *val_str(String*)=0; - virtual Field *tmp_table_field() { return 0; } + virtual Field *get_tmp_table_field() { return 0; } virtual Field *tmp_table_field(TABLE *t_arg) { return 0; } virtual const char *full_name() const { return name ? name : "???"; } virtual double val_result() { return val(); } @@ -267,7 +267,7 @@ public: { return field->type(); } - Field *tmp_table_field() { return result_field; } + Field *get_tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { return result_field; } bool get_date(TIME *ltime,bool fuzzydate); bool get_date_result(TIME *ltime,bool fuzzydate); @@ -546,7 +546,7 @@ public: Item(thd, item), result_field(item.result_field) {} ~Item_result_field() {} /* Required with gcc 2.95 */ - Field *tmp_table_field() { return result_field; } + Field *get_tmp_table_field() { return result_field; } Field *tmp_table_field(TABLE *t_arg) { return result_field; } table_map used_tables() const { return 1; } virtual void fix_length_and_dec()=0; |