diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-15 10:22:03 +0200 |
| commit | b006d2ead4640f0ab4e29687fd7d24988b1c98f1 (patch) | |
| tree | a478984bcd7f4bb2e0fd0496eae77b871077a380 /storage/innobase/rem/rem0rec.cc | |
| parent | b782971c58b5656820429b8ef3fae5fd82f5a0f7 (diff) | |
| parent | dc09f8f29cb2b9fdce7d5d5a623fdc8dcf1814f9 (diff) | |
| download | mariadb-git-b006d2ead4640f0ab4e29687fd7d24988b1c98f1.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/innobase/rem/rem0rec.cc')
| -rw-r--r-- | storage/innobase/rem/rem0rec.cc | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 142aff4270c..dcc435c091f 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -1154,21 +1154,18 @@ rec_get_converted_size_comp_prefix_low( if (fixed_len) { #ifdef UNIV_DEBUG - ulint mbminlen = DATA_MBMINLEN(col->mbminmaxlen); - ulint mbmaxlen = DATA_MBMAXLEN(col->mbminmaxlen); - ut_ad(len <= fixed_len); if (dict_index_is_spatial(index)) { ut_ad(type->mtype == DATA_SYS_CHILD - || !mbmaxlen - || len >= mbminlen * (fixed_len - / mbmaxlen)); + || !col->mbmaxlen + || len >= col->mbminlen + * fixed_len / col->mbmaxlen); } else { ut_ad(type->mtype != DATA_SYS_CHILD); - ut_ad(!mbmaxlen - || len >= mbminlen * (fixed_len - / mbmaxlen)); + ut_ad(!col->mbmaxlen + || len >= col->mbminlen + * fixed_len / col->mbmaxlen); } /* dict_index_add_col() should guarantee this */ @@ -1567,15 +1564,11 @@ rec_convert_dtuple_to_rec_comp( 0..127. The length will be encoded in two bytes when it is 128 or more, or when the field is stored externally. */ if (fixed_len) { -#ifdef UNIV_DEBUG - ulint mbminlen = DATA_MBMINLEN(col->mbminmaxlen); - ulint mbmaxlen = DATA_MBMAXLEN(col->mbminmaxlen); - ut_ad(len <= fixed_len); - ut_ad(!mbmaxlen || len >= mbminlen - * (fixed_len / mbmaxlen)); + ut_ad(!col->mbmaxlen + || len >= col->mbminlen + * fixed_len / col->mbmaxlen); ut_ad(!dfield_is_ext(field)); -#endif /* UNIV_DEBUG */ } else if (dfield_is_ext(field)) { ut_ad(DATA_BIG_COL(col)); ut_ad(len <= REC_ANTELOPE_MAX_INDEX_COL_LEN |