diff options
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sql/field.h b/sql/field.h index 602b4ea779d..2ac7ec2c69d 100644 --- a/sql/field.h +++ b/sql/field.h @@ -55,12 +55,6 @@ public: char *ptr; // Position to field in record uchar *null_ptr; // Byte where null_bit is /* - dflt_field is used only for the fields of temporary tables. - It points to the default value of the field in another table - from which this field has been created. - */ - Field *dflt_field; // Field to copy default value from - /* Note that you can use table->in_use as replacement for current_thd member only inside of val_*() and store() members (e.g. you can't use it in cons) */ @@ -68,10 +62,9 @@ public: struct st_table *orig_table; // Pointer to original table const char **table_name, *field_name; LEX_STRING comment; - query_id_t query_id; // For quick test of used fields - bool add_index; // For check if field will be indexed /* Field is part of the following keys */ - key_map key_start,part_of_key,part_of_sortkey; + key_map key_start, part_of_key, part_of_key_not_clustered; + key_map part_of_sortkey; /* We use three additional unireg types for TIMESTAMP to overcome limitation of current binary format of .frm file. We'd like to be able to support @@ -94,12 +87,8 @@ public: utype unireg_check; uint32 field_length; // Length of field - uint field_index; // field number in fields array uint32 flags; - /* fieldnr is the id of the field (first field = 1) as is also - used in key_part. - */ - uint16 fieldnr; + uint16 field_index; // field number in fields array uchar null_bit; // Bit used to test null bit Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,uchar null_bit_arg, |