diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-04-01 02:14:30 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-04-01 02:14:30 +0300 |
| commit | c831a156ceb2d392ba84ac9bfbee18318b11f333 (patch) | |
| tree | bfd8839a822ffd9c3bcccaa970cc506139ae4a9c /sql/field.h | |
| parent | 8a898a0b72ad14b87608c84f6b775eb586a070a2 (diff) | |
| download | mariadb-git-c831a156ceb2d392ba84ac9bfbee18318b11f333.tar.gz | |
postmerge 4.1->5.0 fixes
mysql-test/r/group_by.result:
result change
mysql-test/r/union.result:
result change
mysql-test/r/view.result:
result change
mysql-test/t/subselect.test:
fixed mistake of merge
sql/field.cc:
new 5.0 types support
temporary table/db names detection in field fixed
sql/field.h:
removed non-existent methods
added wrongly deleted during manual merge string
sql/item.cc:
support of new types added to merge of union types routines
sql/item.h:
fixed method definition
sql/item_cmpfunc.cc:
fixed type
sql/item_func.h:
item type name fixed
sql/item_subselect.cc:
added forgoten methods
sql/item_subselect.h:
fixed type
sql/sql_derived.cc:
fixed typo of manual merge
sql/sql_view.cc:
added new parameter
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 84d5027dc96..ce6753400bb 100644 --- a/sql/field.h +++ b/sql/field.h @@ -468,7 +468,6 @@ public: { return field_length + 1 + (dec ? 1 : 0) + (field_length == dec ? 1 : 0); } uint32 representation_length() { return field_length + 1 + (dec ? 1 : 0) + (field_length == dec ? 1 : 0); }; - field_cast_enum field_cast_type() { return FIELD_CAST_NEWDECIMAL; } uint size_of() const { return sizeof(*this); } uint32 pack_length() const { return (uint32) bin_size; } }; @@ -1002,7 +1001,7 @@ public: enum_field_types real_type() const { return FIELD_TYPE_STRING; } bool has_charset(void) const { return charset() == &my_charset_bin ? FALSE : TRUE; } - field_cast_enum field_cast_type() { return FIELD_CAST_STRING; } + Field *new_field(MEM_ROOT *root, struct st_table *new_table); }; @@ -1305,7 +1304,6 @@ public: { return (uint32) field_length + (bit_len > 0); } uint32 pack_length_in_rec() const { return field_length; } void sql_type(String &str) const; - field_cast_enum field_cast_type() { return FIELD_CAST_BIT; } char *pack(char *to, const char *from, uint max_length=~(uint) 0); const char *unpack(char* to, const char *from); Field *new_key_field(MEM_ROOT *root, struct st_table *new_table, |