diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-11-25 06:09:00 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-11-25 09:09:51 +0200 |
commit | 8da33e3a868e7ab4472823f8f3bfab3d5cd1833e (patch) | |
tree | b255d46a4c0afe7c2ad6396eda024989ebea65be /storage/innobase/lock/lock0lock.cc | |
parent | 1d8eafbeafbc4a77153d6ceb974dbbeff543e648 (diff) | |
download | mariadb-git-8da33e3a868e7ab4472823f8f3bfab3d5cd1833e.tar.gz |
MDEV-11349 (1/2) Fix some clang 4.0 warnings
In InnoDB and XtraDB functions that declare pointer parameters as nonnull,
remove nullness checks, because GCC would optimize them away anyway.
Use #ifdef instead of #if when checking for a configuration flag.
Clang says that left shifts of negative values are undefined.
So, use ~0U instead of ~0 in a number of macros.
Some functions that were defined as UNIV_INLINE were declared as
UNIV_INTERN. Consistently use the same type of linkage.
ibuf_merge_or_delete_for_page() could pass bitmap_page=NULL to
buf_page_print(), conflicting with the __attribute__((nonnull)).
Diffstat (limited to 'storage/innobase/lock/lock0lock.cc')
-rw-r--r-- | storage/innobase/lock/lock0lock.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index c4f9b767afe..9f15c7b3b37 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -2366,7 +2366,6 @@ lock_queue_validate( ulint space; ulint page_no; ulint rec_fold; - hash_table_t* hash; hash_cell_t* cell; lock_t* next; bool wait_lock = false; |