From 6536c210879cf92faed48ea0dcf4684c0f7225bf Mon Sep 17 00:00:00 2001
From: marko <Unknown>
Date: Wed, 10 Feb 2010 09:07:05 +0000
Subject: [PATCH] branches/zip: Clean up after r6559.  Now that
 btr_pcur_open_with_no_init() is a macro, do not mix preprocessor directives
 in the macro invocation, because it is implementation-defined whether that is
 going to work.

---
 row/row0sel.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/row/row0sel.c b/row/row0sel.c
index e14f29d8d6..1656657f9e 100644
--- a/row/row0sel.c
+++ b/row/row0sel.c
@@ -3200,14 +3200,17 @@ row_sel_try_search_shortcut_for_mysql(
 	ut_ad(dict_index_is_clust(index));
 	ut_ad(!prebuilt->templ_contains_blob);
 
+#ifndef UNIV_SEARCH_DEBUG
 	btr_pcur_open_with_no_init(index, search_tuple, PAGE_CUR_GE,
 				   BTR_SEARCH_LEAF, pcur,
-#ifndef UNIV_SEARCH_DEBUG
 				   RW_S_LATCH,
-#else
+				   mtr);
+#else /* UNIV_SEARCH_DEBUG */
+	btr_pcur_open_with_no_init(index, search_tuple, PAGE_CUR_GE,
+				   BTR_SEARCH_LEAF, pcur,
 				   0,
-#endif
 				   mtr);
+#endif /* UNIV_SEARCH_DEBUG */
 	rec = btr_pcur_get_rec(pcur);
 
 	if (!page_rec_is_user_rec(rec)) {
-- 
2.30.9