database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

SQL: No implicit versioning when created from SELECT [closes #219]

Browse Source
This commit is contained in:
Aleksey Midenkov
2017-07-03 17:38:59 +03:00
committed by GitHub
parent 5570ab3789
commit 72de7721b9
8 changed files with 130 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
sql/handler.cc
View File

@ -6675,31 +6675,31 @@ bool Vers_parse_info::check_and_fix_implicit(
if (table->table && table->table->versioned())
vers_tables++;
}
// Possibly override default storage engine to match
// one used in source table.
if (!(create_info->used_fields & HA_CREATE_USED_ENGINE))
{
List_iterator_fast<Create_field> it(alter_info->create_list);
while (Create_field *f= it++)
{
if (is_trx_start(*f) || is_trx_end(*f))
{
create_info->db_type= f->field->orig_table->file->ht;
break;
}
}
}
}
// CREATE ... SELECT: if at least one table in SELECT is versioned,
// then created table will be versioned.
if (thd->variables.vers_force || vers_tables > 0)
if (thd->variables.vers_force)
{
with_system_versioning= true;
create_info->options|= HA_VERSIONED_TABLE;
}
// Possibly override default storage engine to match one used in source table.
if (from_select && with_system_versioning &&
!(create_info->used_fields & HA_CREATE_USED_ENGINE))
{
List_iterator_fast<Create_field> it(alter_info->create_list);
while (Create_field *f= it++)
{
if (is_trx_start(*f) || is_trx_end(*f))
{
create_info->db_type= f->field->orig_table->file->ht;
break;
}
}
}
if (!need_check())
return false;
@ -6764,22 +6764,7 @@ bool Vers_parse_info::check_and_fix_implicit(
bool integer_fields= create_info->db_type->flags & HTON_NATIVE_SYS_VERSIONING;
if (vers_tables > 0)
{
if (!generated_as_row.start && !generated_as_row.end)
{
with_system_versioning= false;
create_info->options&= ~HA_VERSIONED_TABLE;
return false;
}
if (!generated_as_row.start || !generated_as_row.end)
{
my_error_as(ER_VERS_WRONG_PARAMS, ER_MISSING, MYF(0), table_name,
generated_as_row.start ? "AS ROW END" : "AS ROW START");
return true;
}
}
else if (fix_implicit(thd, alter_info, integer_fields))
if (fix_implicit(thd, alter_info, integer_fields))
return true;
int plain_cols= 0; // column doesn't have WITH or WITHOUT SYSTEM VERSIONING