Commit 6a6cc8a6 authored by Monty's avatar Monty

Remove not used table_flag HA_NO_VARCHAR

parent cfd81de6
...@@ -151,7 +151,6 @@ enum enum_alter_inplace_result { ...@@ -151,7 +151,6 @@ enum enum_alter_inplace_result {
#define HA_HAS_OLD_CHECKSUM (1ULL << 24) #define HA_HAS_OLD_CHECKSUM (1ULL << 24)
/* Table data are stored in separate files (for lower_case_table_names) */ /* Table data are stored in separate files (for lower_case_table_names) */
#define HA_FILE_BASED (1ULL << 26) #define HA_FILE_BASED (1ULL << 26)
#define HA_NO_VARCHAR (1ULL << 27) /* unused */
#define HA_CAN_BIT_FIELD (1ULL << 28) /* supports bit fields */ #define HA_CAN_BIT_FIELD (1ULL << 28) /* supports bit fields */
#define HA_NEED_READ_RANGE_BUFFER (1ULL << 29) /* for read_multi_range */ #define HA_NEED_READ_RANGE_BUFFER (1ULL << 29) /* for read_multi_range */
#define HA_ANY_INDEX_MAY_BE_UNIQUE (1ULL << 30) #define HA_ANY_INDEX_MAY_BE_UNIQUE (1ULL << 30)
......
...@@ -2935,20 +2935,6 @@ uint Column_definition::pack_flag_numeric(uint dec) const ...@@ -2935,20 +2935,6 @@ uint Column_definition::pack_flag_numeric(uint dec) const
bool Column_definition::prepare_stage2_varchar(ulonglong table_flags) bool Column_definition::prepare_stage2_varchar(ulonglong table_flags)
{ {
#ifndef QQ_ALL_HANDLERS_SUPPORT_VARCHAR
if (table_flags & HA_NO_VARCHAR)
{
/* convert VARCHAR to CHAR because handler is not yet up to date */
set_handler(&type_handler_var_string);
pack_length= type_handler()->calc_pack_length((uint) length);
if ((length / charset->mbmaxlen) > MAX_FIELD_CHARLENGTH)
{
my_error(ER_TOO_BIG_FIELDLENGTH, MYF(0), field_name.str,
static_cast<ulong>(MAX_FIELD_CHARLENGTH));
return true;
}
}
#endif
pack_flag= (charset->state & MY_CS_BINSORT) ? FIELDFLAG_BINARY : 0; pack_flag= (charset->state & MY_CS_BINSORT) ? FIELDFLAG_BINARY : 0;
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment