[Commits] Rev 4285: Fix compile failure in non-debug build. in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Thu Jul 10 15:24:54 EEST 2014


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4285
revision-id: knielsen at knielsen-hq.org-20140710122453-prl2drw7d4zpyq8u
parent: knielsen at knielsen-hq.org-20140710115553-xlo421livqysdsw1
committer: Kristian Nielsen <knielsen at knielsen-hq.org>
branch nick: tmp-10.0
timestamp: Thu 2014-07-10 14:24:53 +0200
message:
  Fix compile failure in non-debug build.
=== modified file 'storage/innobase/lock/lock0lock.cc'
--- a/storage/innobase/lock/lock0lock.cc	2014-07-09 11:02:52 +0000
+++ b/storage/innobase/lock/lock0lock.cc	2014-07-10 12:24:53 +0000
@@ -394,9 +394,6 @@ UNIV_INTERN mysql_pfs_key_t	lock_sys_mut
 UNIV_INTERN mysql_pfs_key_t     lock_sys_wait_mutex_key;
 #endif /* UNIV_PFS_MUTEX */
 
-#ifdef UNIV_DEBUG
-UNIV_INTERN ibool       lock_print_waits        = FALSE;
-
 /* Buffer to collect THDs to report waits for. */
 struct thd_wait_reports {
         struct thd_wait_reports *next;  /*!< List link */
@@ -405,6 +402,9 @@ struct thd_wait_reports {
 };
 
 
+#ifdef UNIV_DEBUG
+UNIV_INTERN ibool       lock_print_waits        = FALSE;
+
 /*********************************************************************//**
 Validates the lock system.
 @return TRUE if ok */

=== modified file 'storage/xtradb/lock/lock0lock.cc'
--- a/storage/xtradb/lock/lock0lock.cc	2014-07-09 11:02:52 +0000
+++ b/storage/xtradb/lock/lock0lock.cc	2014-07-10 12:24:53 +0000
@@ -394,9 +394,6 @@ UNIV_INTERN mysql_pfs_key_t	lock_sys_mut
 UNIV_INTERN mysql_pfs_key_t     lock_sys_wait_mutex_key;
 #endif /* UNIV_PFS_MUTEX */
 
-#ifdef UNIV_DEBUG
-UNIV_INTERN ibool       lock_print_waits        = FALSE;
-
 /* Buffer to collect THDs to report waits for. */
 struct thd_wait_reports {
         struct thd_wait_reports *next;  /*!< List link */
@@ -405,6 +402,9 @@ struct thd_wait_reports {
 };
 
 
+#ifdef UNIV_DEBUG
+UNIV_INTERN ibool       lock_print_waits        = FALSE;
+
 /*********************************************************************//**
 Validates the lock system.
 @return TRUE if ok */



More information about the commits mailing list