mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
branches/zip: merge_index_field_struct: Remove the unused field col_type.
This commit is contained in:
parent
3e7e12c595
commit
e011cc2f57
2 changed files with 0 additions and 4 deletions
|
@ -8053,8 +8053,6 @@ innobase_create_index_field_def(
|
||||||
|
|
||||||
col_type = get_innobase_type_from_mysql_type(&is_unsigned, field);
|
col_type = get_innobase_type_from_mysql_type(&is_unsigned, field);
|
||||||
|
|
||||||
index_field->col_type = col_type;
|
|
||||||
|
|
||||||
if (DATA_BLOB == col_type
|
if (DATA_BLOB == col_type
|
||||||
|| (key_part->length < field->pack_length()
|
|| (key_part->length < field->pack_length()
|
||||||
&& field->type() != MYSQL_TYPE_VARCHAR)
|
&& field->type() != MYSQL_TYPE_VARCHAR)
|
||||||
|
@ -8137,7 +8135,6 @@ innobase_copy_index_field_def(
|
||||||
DBUG_ASSERT(field != NULL);
|
DBUG_ASSERT(field != NULL);
|
||||||
DBUG_ASSERT(index_field != NULL);
|
DBUG_ASSERT(index_field != NULL);
|
||||||
|
|
||||||
index_field->col_type = (field->col->prtype & 0xFFUL);
|
|
||||||
index_field->field_name = mem_heap_strdup(heap, field->name);
|
index_field->field_name = mem_heap_strdup(heap, field->name);
|
||||||
index_field->prefix_len = field->prefix_len;
|
index_field->prefix_len = field->prefix_len;
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@ Created 13/06/2005 Jan Lindstrom
|
||||||
/* This structure holds index field definitions */
|
/* This structure holds index field definitions */
|
||||||
|
|
||||||
struct merge_index_field_struct {
|
struct merge_index_field_struct {
|
||||||
ulint col_type; /* Column type */
|
|
||||||
ulint prefix_len; /* Prefix len */
|
ulint prefix_len; /* Prefix len */
|
||||||
char* field_name; /* Field name */
|
char* field_name; /* Field name */
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue