From 5288f8c02138051e371b10336d47d6df99d5aac2 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Tue, 7 Sep 2010 13:59:34 +0300
Subject: [PATCH] Fixed compiler failures when compiling non debug build

storage/maria/ha_maria.cc:
  Don't use 'trn' variable to avoid warning about not used variable
storage/maria/ma_delete.c:
  Added __attribute__((unused))
storage/maria/ma_key_recover.c:
  Added __attribute__((unused))
  Fixed wrong placement of #endif
storage/maria/ma_key_recover.h:
  Fixed typo
---
 storage/maria/ha_maria.cc      | 4 ++--
 storage/maria/ma_delete.c      | 2 +-
 storage/maria/ma_key_recover.c | 9 +++++----
 storage/maria/ma_key_recover.h | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 846bfc67a63..a611915b7f4 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -2352,9 +2352,9 @@ int ha_maria::reset(void)
 {
   if (file->trn)
   {
-    TRN *trn= file->trn;
     /* Next statement is a new statement. Ensure it's logged */
-    trnman_set_flags(trn, trnman_get_flags(trn) & ~TRN_STATE_INFO_LOGGED);
+    trnman_set_flags(file->trn,
+                     trnman_get_flags(file->trn) & ~TRN_STATE_INFO_LOGGED);
   }
   return maria_reset(file);
 }
diff --git a/storage/maria/ma_delete.c b/storage/maria/ma_delete.c
index 9a5ff4b1d52..2420cac0e93 100644
--- a/storage/maria/ma_delete.c
+++ b/storage/maria/ma_delete.c
@@ -1445,7 +1445,7 @@ static uint remove_key(MARIA_KEYDEF *keyinfo, uint page_flag, uint nod_flag,
 
 my_bool _ma_log_delete(MARIA_PAGE *ma_page, const uchar *key_pos,
                        uint changed_length, uint move_length,
-                       uint append_length,
+                       uint append_length __attribute__((unused)),
                        enum en_key_debug debug_marker __attribute__((unused)))
 {
   LSN lsn;
diff --git a/storage/maria/ma_key_recover.c b/storage/maria/ma_key_recover.c
index 47cfef73ddd..95fc88ca3db 100644
--- a/storage/maria/ma_key_recover.c
+++ b/storage/maria/ma_key_recover.c
@@ -486,8 +486,8 @@ my_bool _ma_log_suffix(MARIA_PAGE *ma_page, uint org_length, uint new_length)
 */
 
 my_bool _ma_log_add(MARIA_PAGE *ma_page,
-                    uint org_page_length, uchar *key_pos,
-                    uint changed_length, int move_length,
+                    uint org_page_length __attribute__ ((unused)),
+                    uchar *key_pos, uint changed_length, int move_length,
                     my_bool handle_overflow __attribute__ ((unused)))
 {
   LSN lsn;
@@ -670,10 +670,11 @@ void _ma_log_key_changes(MARIA_PAGE *ma_page, LEX_CUSTRING *log_array,
   log_array[1].length= page_length;
   (*changed_length)+=  page_length;
   (*translog_parts)++;
-#endif
-#endif
+#endif /* EXTRA_STORE_FULL_PAGE_IN_KEY_CHANGES */
 }
 
+#endif /* EXTRA_DEBUG_KEY_CHANGES */
+
 /****************************************************************************
   Redo of key pages
 ****************************************************************************/
diff --git a/storage/maria/ma_key_recover.h b/storage/maria/ma_key_recover.h
index 26f5f716c75..3fdb045ee40 100644
--- a/storage/maria/ma_key_recover.h
+++ b/storage/maria/ma_key_recover.h
@@ -82,7 +82,7 @@ void _ma_log_key_changes(MARIA_PAGE *ma_page, LEX_CUSTRING *log_array,
                          uchar *log_pos, uint *changed_length,
                          uint *translog_parts);
 #else
-void _ma_log_key_changes(A,B,C,D,E)
+#define _ma_log_key_changes(A,B,C,D,E)
 #endif
 
 uint _ma_apply_redo_index_new_page(MARIA_HA *info, LSN lsn,