diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
| commit | 5c3ff5cb93f8363820d506cdad3daafbc944f03b (patch) | |
| tree | f5671e95dabd8ced0c7925e54b351bd704e41bcf /sql/sql_partition.cc | |
| parent | f9ab7b473a935141f85d27994d0faf3433a73144 (diff) | |
| parent | 7b42d892de6acc04490f5cb6b8355c72b8f1a406 (diff) | |
| download | mariadb-git-5c3ff5cb93f8363820d506cdad3daafbc944f03b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 6b530a95efb..746a030a7ab 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -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)) { |