summaryrefslogtreecommitdiff
path: root/storage/innobase/dict
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-11-25 10:54:38 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-11-25 10:54:38 +0200
commit1c9833c511b495ed5fee16e9f769f8a458408275 (patch)
treee9c328f60f5e83babf508531267a4bc187920283 /storage/innobase/dict
parentfa6d710b85bb5d689661ce4cd69e09d9464f397a (diff)
downloadmariadb-git-1c9833c511b495ed5fee16e9f769f8a458408275.tar.gz
Cleanup: row_log_free()
The nonnull attribute is not applicable to parameters that are passed by reference, at least not in the Intel compiler. Let us remove the reference indirection, which was only there so that the pointer could be assigned to NULL, and let the callers perform that task. row_log_allocate(): Fix a bug in out-of-memory error handling that would leave a pointer to freed memory.
Diffstat (limited to 'storage/innobase/dict')
-rw-r--r--storage/innobase/dict/dict0dict.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
index 2124fc05faa..6f546dfbd94 100644
--- a/storage/innobase/dict/dict0dict.cc
+++ b/storage/innobase/dict/dict0dict.cc
@@ -2215,6 +2215,7 @@ dict_index_remove_from_cache_low(
if (index->online_log) {
ut_ad(index->online_status == ONLINE_INDEX_CREATION);
row_log_free(index->online_log);
+ index->online_log = NULL;
}
/* Remove the index from the list of indexes of the table */