InnoDB cleanup: eliminate IB__FILE__

innobase/btr/btr0cur.c:
  Replace IB__FILE__ with __FILE__
innobase/btr/btr0sea.c:
  Replace IB__FILE__ with __FILE__
innobase/buf/buf0buf.c:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/ibuf/ibuf0ibuf.c:
  Replace IB__FILE__ with __FILE__
innobase/include/buf0buf.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/buf0buf.ic:
  Replace IB__FILE__ with __FILE__
innobase/include/mem0mem.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/mem0mem.ic:
  Add const qualifiers
innobase/include/mtr0mtr.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/mtr0mtr.ic:
  Add const qualifiers
innobase/include/pars0pars.h:
  Add const qualifiers
innobase/include/sync0arr.h:
  Add const qualifiers
innobase/include/sync0ipm.ic:
  Replace IB__FILE__ with __FILE__
innobase/include/sync0rw.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/sync0rw.ic:
  Add const qualifiers
innobase/include/sync0sync.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/sync0sync.ic:
  Add const qualifiers
innobase/include/univ.i:
  Remove IB__FILE__
innobase/include/ut0dbg.h:
  Replace IB__FILE__ with __FILE__
innobase/lock/lock0lock.c:
  Replace IB__FILE__ with __FILE__
innobase/log/log0recv.c:
  Replace IB__FILE__ with __FILE__
innobase/mem/mem0mem.c:
  Add const qualifiers
innobase/pars/pars0pars.c:
  Add const qualifiers
innobase/sync/sync0arr.c:
  Add const qualifiers
innobase/sync/sync0rw.c:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/sync/sync0sync.c:
  Add const qualifiers
innobase/trx/trx0rec.c:
  Replace IB__FILE__ with __FILE__

3 files changed, 15 insertions, 14 deletions

diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c
index 426d7ff9f92..02a9771be35 100644
--- a/innobase/sync/sync0arr.c
+++ b/innobase/sync/sync0arr.c
@@ -53,7 +53,7 @@ struct sync_cell_struct {
 	rw_lock_t*	old_wait_rw_lock;/* the latest wait rw-lock in cell */
         ulint		request_type;	/* lock type requested on the
         				object */
-	char*		file;		/* in debug version file where
+	const char*	file;		/* in debug version file where
 					requested */
 	ulint		line;		/* in debug version line where
 					requested */
@@ -329,7 +329,7 @@ sync_array_reserve_cell(
         sync_array_t*	arr,	/* in: wait array */
         void*   	object, /* in: pointer to the object to wait for */
         ulint		type,	/* in: lock request type */
-        char*		file,	/* in: file where requested */
+	const char*	file,	/* in: file where requested */
         ulint		line,	/* in: line where requested */
         ulint*   	index)  /* out: index of the reserved cell */
 {
diff --git a/innobase/sync/sync0rw.c b/innobase/sync/sync0rw.c
index 43f8d646eaa..769eb326ce2 100644
--- a/innobase/sync/sync0rw.c
+++ b/innobase/sync/sync0rw.c
@@ -89,7 +89,7 @@ void
 rw_lock_create_func(
 /*================*/
 	rw_lock_t*	lock,		/* in: pointer to memory */
-	char*		cfile_name,	/* in: file name where created */
+	const char*	cfile_name,	/* in: file name where created */
 	ulint		cline)		/* in: file line where created */
 {
 	/* If this is the very first time a synchronization
@@ -213,7 +213,7 @@ rw_lock_s_lock_spin(
         rw_lock_t*   	lock,  	/* in: pointer to rw-lock */
 	ulint		pass,	/* in: pass value; != 0, if the lock
 				will be passed to another thread to unlock */
-	char*		file_name, /* in: file name where lock requested */
+	const char*	file_name, /* in: file name where lock requested */
 	ulint		line)	/* in: line where requested */
 {
         ulint    index;	/* index of the reserved wait cell */
@@ -324,7 +324,7 @@ rw_lock_x_lock_low(
         rw_lock_t*   	lock,  	/* in: pointer to rw-lock */
 	ulint		pass,	/* in: pass value; != 0, if the lock will
 				be passed to another thread to unlock */
-	char*		file_name,/* in: file name where lock requested */
+	const char*	file_name,/* in: file name where lock requested */
 	ulint		line)	/* in: line where requested */
 {
 #ifdef UNIV_SYNC_DEBUG
@@ -429,7 +429,7 @@ rw_lock_x_lock_func(
         rw_lock_t*   	lock,  	/* in: pointer to rw-lock */
 	ulint		pass,	/* in: pass value; != 0, if the lock will
 				be passed to another thread to unlock */
-	char*		file_name,/* in: file name where lock requested */
+	const char*	file_name,/* in: file name where lock requested */
 	ulint		line)	/* in: line where requested */
 {
         ulint	index;  /* index of the reserved wait cell */
@@ -551,7 +551,7 @@ rw_lock_debug_mutex_enter(void)
 {
 loop:
 	if (0 == mutex_enter_nowait(&rw_lock_debug_mutex,
-			IB__FILE__, __LINE__)) {
+			__FILE__, __LINE__)) {
 		return;
 	}
 
@@ -560,7 +560,7 @@ loop:
 	rw_lock_debug_waiters = TRUE;
 
 	if (0 == mutex_enter_nowait(&rw_lock_debug_mutex,
-			IB__FILE__, __LINE__)) {
+			__FILE__, __LINE__)) {
 		return;
 	}
 
diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c
index c1fb31bc966..31f287b6341 100644
--- a/innobase/sync/sync0sync.c
+++ b/innobase/sync/sync0sync.c
@@ -201,7 +201,7 @@ void
 mutex_create_func(
 /*==============*/
 	mutex_t*	mutex,		/* in: pointer to memory */
-	char*		cfile_name,	/* in: file name where created */
+	const char*	cfile_name,	/* in: file name where created */
 	ulint		cline)		/* in: file line where created */
 {
 #if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER)
@@ -294,10 +294,10 @@ mutex_enter_nowait(
 /*===============*/
 					/* out: 0 if succeed, 1 if not */
 	mutex_t*	mutex,		/* in: pointer to mutex */
-	char*	   	file_name __attribute__((unused)),
+	const char*	file_name __attribute__((unused)),
 					/* in: file name where mutex
 					requested */
-	ulint	   	line __attribute__((unused)))
+	ulint		line __attribute__((unused)))
 					/* in: line where requested */
 {
 	ut_ad(mutex_validate(mutex));
@@ -357,9 +357,10 @@ for the mutex before suspending the thread. */
 void
 mutex_spin_wait(
 /*============*/
-        mutex_t*   mutex,     	/* in: pointer to mutex */
-	char*	   file_name, 	/* in: file name where mutex requested */
-	ulint	   line)	/* in: line where requested */
+        mutex_t*	   mutex,     	/* in: pointer to mutex */
+	const char*	   file_name, 	/* in: file name where
+					mutex requested */
+	ulint		   line)	/* in: line where requested */
 {
         ulint    index; /* index of the reserved wait cell */
         ulint    i;   	/* spin round count */