diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
| commit | e9c1701e11e2441435223cc7c00c467f58aaff19 (patch) | |
| tree | 6be7d0e8fe87272e1abb2704fdb9859481d8acc2 /storage/innobase/data | |
| parent | 17794fb9aac9ca4fcb0b1e5904671a025a1b6b74 (diff) | |
| parent | f3eb82f048d342c11fc3869eca2e6faed9a4835d (diff) | |
| download | mariadb-git-e9c1701e11e2441435223cc7c00c467f58aaff19.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/data')
| -rw-r--r-- | storage/innobase/data/data0data.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/data/data0data.cc b/storage/innobase/data/data0data.cc index 02f921f716c..7cc9c2bc09e 100644 --- a/storage/innobase/data/data0data.cc +++ b/storage/innobase/data/data0data.cc @@ -601,7 +601,6 @@ dtuple_convert_big_rec( dfield_t* dfield; ulint size; ulint n_fields; - ulint local_len; ulint local_prefix_len; if (!dict_index_is_clust(index)) { @@ -612,6 +611,7 @@ dtuple_convert_big_rec( return NULL; } + ulint local_len = index->table->get_overflow_field_local_len(); const auto zip_size = index->table->space->zip_size(); ut_ad(index->n_uniq > 0); |