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

MDEV-14631 Assertion `!sys_trx_start && !sys_trx_end' failed in crete_tmp_table

Browse Source 
SQL: remove unneeded assertion
SQL: disallow set sys_trx fields in INSERT ... SELECT

Fixes by @midenok.
This commit is contained in:
Eugene Kosov
2017-12-12 22:33:49 +03:00
committed by Aleksey Midenkov
parent c66a20b494
commit 717f274b87
7 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_base.cc
View File

@ -8067,12 +8067,11 @@ fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values,
ER_THD(thd, ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN),
rfield->field_name.str, table->s->table_name.str);
}
if (table->versioned() && rfield->vers_sys_field() &&
!ignore_errors)
if (table->versioned() && rfield->vers_sys_field())
{
if (type == Item::DEFAULT_VALUE_ITEM)
continue;
my_error(ER_VERS_READONLY_FIELD, MYF(0), rfield->field_name.str);
my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), rfield->field_name.str);
goto err;
}
@ -8308,7 +8307,7 @@ fill_record(THD *thd, TABLE *table, Field **ptr, List<Item> &values,
if (table->versioned() && field->vers_sys_field() && !ignore_errors)
{
my_error(ER_VERS_READONLY_FIELD, MYF(0), field->field_name.str);
my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), field->field_name.str);
goto err;
}