summaryrefslogtreecommitdiff
path: root/storage/innobase/buf
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-03 09:46:49 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-03 09:46:49 +0300
commitc0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (patch)
tree81bffdb7541b3957dde9d7b689baa7b43375ce67 /storage/innobase/buf
parent65d758aa891bdafca6c881d3e7075979de3395e9 (diff)
downloadmariadb-git-c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e.tar.gz
Fix -Wnonnull-compare
InnoDB and XtraDB had redundant assertions for checking that function parameters that were declared as nonnull were not NULL.
Diffstat (limited to 'storage/innobase/buf')
-rw-r--r--storage/innobase/buf/buf0buddy.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/buf/buf0buddy.cc b/storage/innobase/buf/buf0buddy.cc
index c8c39e0caaf..d11a5cf9873 100644
--- a/storage/innobase/buf/buf0buddy.cc
+++ b/storage/innobase/buf/buf0buddy.cc
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2018, MariaDB Corporation.
+Copyright (c) 2018, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -480,7 +480,6 @@ buf_buddy_alloc_low(
{
buf_block_t* block;
- ut_ad(lru);
ut_ad(buf_pool_mutex_own(buf_pool));
ut_ad(!mutex_own(&buf_pool->zip_mutex));
ut_ad(i >= buf_buddy_get_slot(UNIV_ZIP_SIZE_MIN));