summaryrefslogtreecommitdiff
path: root/storage/innobase/sync/sync0arr.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-08-10 14:00:51 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-08-10 14:00:51 +0300
commitbfffe571accb93c80066b070688e6712d4cb5643 (patch)
treeccc266b76beb3062a1e3d06b64e194fa29868847 /storage/innobase/sync/sync0arr.cc
parentcb2a57c2036ba09ba28d413aa5f171cb25cb36f5 (diff)
downloadmariadb-git-bfffe571accb93c80066b070688e6712d4cb5643.tar.gz
Fix some GCC 7 warnings for InnoDB
buf_page_io_complete(): Do not test bpage for NULL, because it is declared (and always passed) as nonnull. buf_flush_batch(): Remove the constant local variable count=0. fil_ibd_load(): Use magic comment to suppress -Wimplicit-fallthrough. ut_stage_alter_t::inc(ulint): Disable references to an unused parameter. lock_queue_validate(), sync_array_find_thread(), rbt_check_ordering(): Define only in debug builds.
Diffstat (limited to 'storage/innobase/sync/sync0arr.cc')
-rw-r--r--storage/innobase/sync/sync0arr.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/sync/sync0arr.cc b/storage/innobase/sync/sync0arr.cc
index 75919043731..f1589e1f3a7 100644
--- a/storage/innobase/sync/sync0arr.cc
+++ b/storage/innobase/sync/sync0arr.cc
@@ -621,6 +621,7 @@ sync_array_cell_print(
}
}
+#ifdef UNIV_DEBUG
/******************************************************************//**
Looks for a cell with the given thread id.
@return pointer to cell or NULL if not found */
@@ -648,7 +649,6 @@ sync_array_find_thread(
return(NULL); /* Not found */
}
-#ifdef UNIV_DEBUG
/******************************************************************//**
Recursion step for deadlock detection.
@return TRUE if deadlock detected */