database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Revert "MDEV-20342 Turn Field::flags from a member to a method"

Browse Source 
This reverts commit e86010f909.

Reverting on Monty's request, as this change makes merging
things from 10.5 to 10.2 much harder.
This commit is contained in:
Alexander Barkov
2019-08-14 20:27:00 +04:00
parent e86010f909
commit afe6eb499d
59 changed files with 453 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_type.cc
View File

@@ -2533,6 +2533,7 @@ bool Type_handler_string::
bool Type_handler_blob_common::
Column_definition_fix_attributes(Column_definition *def) const
{
def->flags|= BLOB_FLAG;
return def->check_length(ER_TOO_BIG_DISPLAYWIDTH, MAX_FIELD_BLOBLENGTH);
}
@@ -2542,7 +2543,7 @@ bool Type_handler_year::
{
if (!def->length || def->length != 2)
def->length= 4; // Default length
def->add_flags(ZEROFILL_FLAG | UNSIGNED_FLAG);
def->flags|= ZEROFILL_FLAG | UNSIGNED_FLAG;
return false;
}
@@ -2562,7 +2563,7 @@ bool Type_handler_double::
bool Type_handler_timestamp_common::
Column_definition_fix_attributes(Column_definition *def) const
{
def->add_flags(UNSIGNED_FLAG);
def->flags|= UNSIGNED_FLAG;
return def->fix_attributes_temporal_with_time(MAX_DATETIME_WIDTH);
}
@@ -2623,7 +2624,7 @@ void Type_handler_typelib::
Column_definition *def,
const Field *field) const
{
DBUG_ASSERT(def->flags() & (ENUM_FLAG | SET_FLAG));
DBUG_ASSERT(def->flags & (ENUM_FLAG | SET_FLAG));
def->interval= field->get_typelib();
}