database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

14
sql/sql_show.cc
View File

@ -1666,7 +1666,7 @@ static bool get_field_default_value(THD *thd, Field *field, String *def_value,
has_default= (field->default_value ||
(!(field->flags & NO_DEFAULT_VALUE_FLAG) &&
!field->is_generated() &&
!field->vers_sys_field() &&
field->unireg_check != Field::NEXT_NUMBER));
def_value->length(0);
@ -2109,7 +2109,7 @@ int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet,
{
if (flags & NOT_NULL_FLAG)
packet->append(STRING_WITH_LEN(" NOT NULL"));
else if (field->type() == MYSQL_TYPE_TIMESTAMP)
else if (field->type() == MYSQL_TYPE_TIMESTAMP && !field->vers_sys_field())
{
/*
TIMESTAMP field require explicit NULL flag, because unlike
@ -2124,16 +2124,16 @@ int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet,
packet->append(STRING_WITH_LEN(" DEFAULT "));
packet->append(def_value.ptr(), def_value.length(), system_charset_info);
}
else if (field->is_generated_row_start())
else if (field->flags & VERS_SYS_START_FLAG)
{
packet->append(STRING_WITH_LEN(" GENERATED AS ROW START"));
packet->append(STRING_WITH_LEN(" GENERATED ALWAYS AS ROW START"));
}
else if (field->is_generated_row_end())
else if (field->flags & VERS_SYS_END_FLAG)
{
packet->append(STRING_WITH_LEN(" GENERATED AS ROW END"));
packet->append(STRING_WITH_LEN(" GENERATED ALWAYS AS ROW END"));
}
if (field->is_versioning_disabled())
if (field->flags & VERS_OPTIMIZED_UPDATE_FLAG)
{
packet->append(STRING_WITH_LEN(" WITHOUT SYSTEM VERSIONING"));
}