database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

SQL: default NULL for sys fields + misc fixes

Browse Source 
* sys fields are NULL by default (with exceptions, see comment about NOT_NULL_FLAG in #77);
* error codes renamed, messages cleared out;
* SHOW CREATE TABLE fixed;
* set_max() fix;
* redundant flag setters/getters removed;
* flags are set in sql_yacc.yy, redundant copy_info_about_generated_fields() eliminated.
This commit is contained in:
Aleksey Midenkov
2016-11-20 18:17:28 +00:00
parent b98f09fcbf
commit a1c36f2e15
17 changed files with 77 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sql/sql_table.cc
View File

@ -3051,7 +3051,7 @@ void promote_first_timestamp_column(List<Create_field> *column_definitions)
column_definition->default_value == NULL && // no constant default,
column_definition->unireg_check == Field::NONE && // no function default
column_definition->vcol_info == NULL &&
!(column_definition->flags & (GENERATED_ROW_START_FLAG | GENERATED_ROW_END_FLAG))) // column isn't generated
!(column_definition->flags & (VERS_SYS_START_FLAG | VERS_SYS_END_FLAG))) // column isn't generated
{
DBUG_PRINT("info", ("First TIMESTAMP column '%s' was promoted to "
"DEFAULT CURRENT_TIMESTAMP ON UPDATE "
@ -3146,37 +3146,6 @@ static void check_duplicate_key(THD *thd, Key *key, KEY *key_info,
}
}
static void
copy_info_about_generated_fields(Alter_info *dst_alter_info,
HA_CREATE_INFO *src_create_info)
{
if (!src_create_info->versioned())
return;
const char *row_start_field = src_create_info->vers_info.generated_as_row.start->c_ptr();
DBUG_ASSERT(row_start_field);
const char *row_end_field = src_create_info->vers_info.generated_as_row.end->c_ptr();
DBUG_ASSERT(row_end_field);
List_iterator<Create_field> it(dst_alter_info->create_list);
Create_field *column_definition = NULL;
while ( (column_definition = it++) )
{
if (!my_strcasecmp(system_charset_info,
row_start_field,
column_definition->field_name))
{
column_definition->flags |= GENERATED_ROW_START_FLAG;
}
else if (!my_strcasecmp(system_charset_info,
row_end_field,
column_definition->field_name))
{
column_definition->flags |= GENERATED_ROW_END_FLAG;
}
}
}
/*
Preparation for table creation
@ -5039,8 +5008,6 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table,
else
create_table_mode= C_ASSISTED_DISCOVERY;
copy_info_about_generated_fields(alter_info, create_info);
if (!opt_explicit_defaults_for_timestamp)
promote_first_timestamp_column(&alter_info->create_list);