From fc85c80b88c0717684184f22a91f8b027a8f8559 Mon Sep 17 00:00:00 2001
From: "marko@hundin.mysql.fi" <>
Date: Thu, 27 May 2004 15:27:43 +0300
Subject: InnoDB cleanup: Disable log archiving code unless #ifdef
 UNIV_LOG_ARCHIVE Remove (char*) casts of string constants; add const
 qualifiers Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP

---
 innobase/sync/sync0sync.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'innobase/sync/sync0sync.c')

diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c
index 31f287b6341..89bfb5dd02e 100644
--- a/innobase/sync/sync0sync.c
+++ b/innobase/sync/sync0sync.c
@@ -214,7 +214,7 @@ mutex_create_func(
 	mutex->magic_n = MUTEX_MAGIC_N;
 #ifdef UNIV_SYNC_DEBUG
 	mutex->line = 0;
-	mutex->file_name = (char *) "not yet reserved";
+	mutex->file_name = "not yet reserved";
 #endif /* UNIV_SYNC_DEBUG */
 	mutex->level = SYNC_LEVEL_NONE;
 	mutex->cfile_name = cfile_name;
@@ -512,7 +512,7 @@ void
 mutex_set_debug_info(
 /*=================*/
 	mutex_t*	mutex,		/* in: mutex */
-	char*		file_name,	/* in: file where requested */
+	const char*	file_name,	/* in: file where requested */
 	ulint		line)		/* in: line where requested */
 {
 	ut_ad(mutex);
-- 
cgit v1.2.1


From d2724e66db4336c6e91ed743059d11f72704918e Mon Sep 17 00:00:00 2001
From: "marko@hundin.mysql.fi" <>
Date: Wed, 16 Jun 2004 13:41:14 +0300
Subject: InnoDB: Revert most of ChangeSet@1.1772, as the debug functions may
 be needed when testing production releases

---
 innobase/sync/sync0sync.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'innobase/sync/sync0sync.c')

diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c
index 0897cc72a4f..5ee08d83987 100644
--- a/innobase/sync/sync0sync.c
+++ b/innobase/sync/sync0sync.c
@@ -299,7 +299,6 @@ mutex_enter_nowait(
 	return(1);
 }
 
-#ifdef UNIV_DEBUG
 /**********************************************************************
 Checks that the mutex has been initialized. */
 
@@ -313,7 +312,6 @@ mutex_validate(
 
 	return(TRUE);
 }
-#endif /* UNIV_DEBUG */
 
 /**********************************************************************
 Sets the waiters field in a mutex. */
@@ -1060,12 +1058,8 @@ sync_thread_add_level(
 	} else if (level == SYNC_DICT_HEADER) {
 		ut_a(sync_thread_levels_g(array, SYNC_DICT_HEADER));
 	} else if (level == SYNC_DICT) {
-#ifdef UNIV_DEBUG
-		ut_a(buf_debug_prints ||
-			sync_thread_levels_g(array, SYNC_DICT));
-#else /* UNIV_DEBUG */
-		ut_a(sync_thread_levels_g(array, SYNC_DICT));
-#endif /* UNIV_DEBUG */
+		ut_a(buf_debug_prints
+		     || sync_thread_levels_g(array, SYNC_DICT));
 	} else {
 		ut_error;
 	}
-- 
cgit v1.2.1