3 files changed, 7 insertions, 9 deletions
diff --git a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c
index 50f54dcad70..63e70eb1b83 100644
--- a/innobase/btr/btr0btr.c
+++ b/innobase/btr/btr0btr.c
@@ -6,9 +6,6 @@ The B-tree
 Created 6/2/1994 Heikki Tuuri
 *******************************************************/
 
-/* Test a change in bitkeeper */
-
-
 #include "btr0btr.h"
 
 #ifdef UNIV_NONINL
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
index c5ea8232a37..e0e59152895 100644
--- a/innobase/btr/btr0cur.c
+++ b/innobase/btr/btr0cur.c
@@ -25,6 +25,7 @@ Created 10/16/1994 Heikki Tuuri
 
 #include "page0page.h"
 #include "rem0rec.h"
+#include "rem0cmp.h"
 #include "btr0btr.h"
 #include "btr0sea.h"
 #include "row0upd.h"
@@ -314,7 +315,7 @@ retry_page_get:
 		page = buf_page_get_gen(space, page_no, rw_latch, guess,
 					buf_mode,
 #ifdef UNIV_SYNC_DEBUG
-					__FILE__, __LINE__,
+					IB__FILE__, __LINE__,
 #endif
 					mtr);
 
@@ -485,7 +486,7 @@ btr_cur_open_at_index_side(
 		page = buf_page_get_gen(space, page_no, RW_NO_LATCH, NULL,
 					BUF_GET,
 #ifdef UNIV_SYNC_DEBUG
-					__FILE__, __LINE__,
+					IB__FILE__, __LINE__,
 #endif
 					mtr);
 		ut_ad(0 == ut_dulint_cmp(tree->id,
@@ -574,7 +575,7 @@ btr_cur_open_at_rnd_pos(
 		page = buf_page_get_gen(space, page_no, RW_NO_LATCH, NULL,
 					BUF_GET,
 #ifdef UNIV_SYNC_DEBUG
-					__FILE__, __LINE__,
+					IB__FILE__, __LINE__,
 #endif
 					mtr);
 		ut_ad(0 == ut_dulint_cmp(tree->id,
diff --git a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c
index 89e396013fa..318bf97e7d2 100644
--- a/innobase/btr/btr0sea.c
+++ b/innobase/btr/btr0sea.c
@@ -187,13 +187,13 @@ btr_search_info_update_hash(
 		return;
 	}
 
+	n_unique = dict_index_get_n_unique_in_tree(index);
+
 	if (info->n_hash_potential == 0) {
 
 		goto set_new_recomm;
 	}
 
-	n_unique = dict_index_get_n_unique_in_tree(index);
-
 	/* Test if the search would have succeeded using the recommended
 	hash prefix */
 
@@ -676,7 +676,7 @@ btr_search_guess_on_hash(
 		success = buf_page_get_known_nowait(latch_mode, page,
 						BUF_MAKE_YOUNG,
 #ifdef UNIV_SYNC_DEBUG
-						__FILE__, __LINE__,
+						IB__FILE__, __LINE__,
 #endif
 						mtr);