diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
| commit | 4a0b56f60436cab3f2f60b15ec699cb19c1e10ba (patch) | |
| tree | 141f7f177748f763dab14484514453cec367c585 /storage/innobase/row | |
| parent | 0bf843cd13981b03920bfc49c646b28a130f5d47 (diff) | |
| parent | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (diff) | |
| download | mariadb-git-4a0b56f60436cab3f2f60b15ec699cb19c1e10ba.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/row')
| -rw-r--r-- | storage/innobase/row/row0log.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc index a654f221f38..1e5362180ba 100644 --- a/storage/innobase/row/row0log.cc +++ b/storage/innobase/row/row0log.cc @@ -1178,19 +1178,15 @@ row_log_table_get_pk_col( return(DB_INVALID_NULL); } - ulint new_i = dict_col_get_clust_pos(ifield->col, index); - - if (UNIV_UNLIKELY(new_i >= log->defaults->n_fields)) { - ut_ad(0); - return DB_INVALID_NULL; - } + unsigned col_no= ifield->col->ind; + ut_ad(col_no < log->defaults->n_fields); field = static_cast<const byte*>( - log->defaults->fields[new_i].data); + log->defaults->fields[col_no].data); if (!field) { return(DB_INVALID_NULL); } - len = log->defaults->fields[new_i].len; + len = log->defaults->fields[col_no].len; } if (rec_offs_nth_extern(offsets, i)) { @@ -1672,10 +1668,12 @@ blob_done: const dfield_t& default_field = log->defaults->fields[col_no]; - Field* field = log->old_table->field[col_no]; + + Field* field = log->old_table->field[col->ind]; field->set_warning(Sql_condition::WARN_LEVEL_WARN, - WARN_DATA_TRUNCATED, 1, ulong(log->n_rows)); + WARN_DATA_TRUNCATED, 1, + ulong(log->n_rows)); if (!log->allow_not_null) { /* We got a NULL value for a NOT NULL column. */ |