diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:50:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 18:50:25 +0300 |
| commit | b3e395a13ee7e9df323cb654d18dc81ff2f3fd1e (patch) | |
| tree | 6078ccc55d5298796c3f626fb4886a131b833e37 /storage | |
| parent | e14ffd85d09a62d098d3db9597fd34bf3d4c4fe3 (diff) | |
| parent | 187b9c924ebaff8f02fb4e2139a01fd1512e3dc9 (diff) | |
| download | mariadb-git-b3e395a13ee7e9df323cb654d18dc81ff2f3fd1e.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/page/page0zip.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc index 46ff37b50fb..2e5e9c5207a 100644 --- a/storage/innobase/page/page0zip.cc +++ b/storage/innobase/page/page0zip.cc @@ -1752,8 +1752,9 @@ page_zip_fields_decode( if (!val) { val = ULINT_UNDEFINED; } else if (UNIV_UNLIKELY(val >= n)) { +fail: page_zip_fields_free(index); - index = NULL; + return NULL; } else { index->type = DICT_CLUSTERED; } @@ -1762,8 +1763,7 @@ page_zip_fields_decode( } else { /* Decode the number of nullable fields. */ if (UNIV_UNLIKELY(index->n_nullable > val)) { - page_zip_fields_free(index); - index = NULL; + goto fail; } else { index->n_nullable = unsigned(val); } |