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

System Versioning 1.0 pre5 [closes #407]

Browse Source 
Merge branch '10.3' into trunk

Both field_visibility and VERS_HIDDEN_FLAG exist independently.

TODO:
VERS_HIDDEN_FLAG should be replaced with SYSTEM_INVISIBLE (or COMPLETELY_INVISIBLE?).
This commit is contained in:
Aleksey Midenkov
2017-12-15 15:01:13 +03:00
parent 2ae2876a6c 2b67b7cb08
commit 73606a3977
91 changed files with 2662 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.cc
View File

@ -6768,7 +6768,7 @@ static Create_field *vers_init_sys_field(THD *thd, const char *field_name,
f->field_name.str= field_name;
f->field_name.length= strlen(field_name);
f->charset= system_charset_info;
f->flags= flags | HIDDEN_FLAG;
f->flags= flags | VERS_HIDDEN_FLAG;
if (integer_fields)
{
f->set_handler(&type_handler_longlong);
@ -7124,13 +7124,13 @@ bool Vers_parse_info::fix_alter_info(THD *thd, Alter_info *alter_info,
return true;
}
if (!(share->vers_start_field()->flags & HIDDEN_FLAG))
if (!(share->vers_start_field()->flags & VERS_HIDDEN_FLAG))
{
my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0),
share->vers_start_field()->field_name.str);
return true;
}
if (!(share->vers_end_field()->flags & HIDDEN_FLAG))
if (!(share->vers_end_field()->flags & VERS_HIDDEN_FLAG))
{
my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0),
share->vers_end_field()->field_name.str);
@ -7259,7 +7259,7 @@ bool Vers_parse_info::fix_alter_info(THD *thd, Alter_info *alter_info,
}
else
continue;
if (f->flags & HIDDEN_FLAG)
if (f->flags & VERS_HIDDEN_FLAG)
{
my_error(ER_CANT_DROP_FIELD_OR_KEY, MYF(0), d->type_name(), name);
return true;