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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-02 11:04:54 +03:00
parent f9ab7b473a 7b42d892de
commit 5c3ff5cb93
143 changed files with 4033 additions and 2689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_partition.cc
View File

@ -341,7 +341,15 @@ static bool set_up_field_array(THD *thd, TABLE *table,
while ((field= *(ptr++)))
{
if (field->flags & GET_FIXED_FIELDS_FLAG)
{
if (table->versioned(VERS_TRX_ID)
&& unlikely(field->flags & VERS_SYSTEM_FIELD))
{
my_error(ER_VERS_TRX_PART_HISTORIC_ROW_NOT_SUPPORTED, MYF(0));
DBUG_RETURN(TRUE);
}
num_fields++;
}
}
if (unlikely(num_fields > MAX_REF_PARTS))
{