diff options
| author | monty@mysql.com <> | 2004-12-07 15:47:00 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-07 15:47:00 +0200 |
| commit | 563500994a31c2239a7d87ba9c5ea889493e3596 (patch) | |
| tree | b1c918186908fb490aa860c35dc9e2154aa633c8 /sql/item.h | |
| parent | 77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (diff) | |
| download | mariadb-git-563500994a31c2239a7d87ba9c5ea889493e3596.tar.gz | |
Update results for new varchar handling
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 973039f9127..cf3dc8896a5 100644 --- a/sql/item.h +++ b/sql/item.h @@ -173,6 +173,7 @@ public: void init_make_field(Send_field *tmp_field,enum enum_field_types type); virtual void cleanup(); virtual void make_field(Send_field *field); + Field *make_string_field(TABLE *table); virtual bool fix_fields(THD *, struct st_table_list *, Item **); /* should be used in case where we are sure that we do not need @@ -894,7 +895,7 @@ public: } int save_in_field(Field *field, bool no_conversions); enum Item_result result_type () const { return STRING_RESULT; } - enum_field_types field_type() const { return MYSQL_TYPE_STRING; } + enum_field_types field_type() const { return MYSQL_TYPE_VARCHAR; } bool basic_const_item() const { return 1; } bool eq(const Item *item, bool binary_cmp) const; Item *new_item() @@ -970,7 +971,7 @@ public: String *val_str(String*) { DBUG_ASSERT(fixed == 1); return &str_value; } int save_in_field(Field *field, bool no_conversions); enum Item_result result_type () const { return STRING_RESULT; } - enum_field_types field_type() const { return MYSQL_TYPE_STRING; } + enum_field_types field_type() const { return MYSQL_TYPE_VARCHAR; } // to prevent drop fixed flag (no need parent cleanup call) void cleanup() {} }; |