From 364f8611b0035e404b4acc137361176dea7a45bd Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@mysql.com>
Date: Fri, 16 Jan 2009 11:38:02 +0200
Subject: [PATCH] Fixed issues in last push found by pushbuild

sql/sql_insert.cc:
  Removed DBUG_ASSERT() that is triggered by deadlock-innodb test
storage/maria/ma_loghandler.c:
  Removed compiler warnings
storage/maria/trnman_public.h:
  Fixed wrong code from last push
---
 sql/sql_insert.cc             | 5 ++++-
 storage/maria/ma_loghandler.c | 7 +++++--
 storage/maria/trnman_public.h | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 1831e13dcf2..b10a7789079 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3493,8 +3493,11 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
                                     MYSQL_LOCK_IGNORE_FLUSH, &not_used)) ||
         hooks->postlock(&table, 1))
   {
-    DBUG_ASSERT(0);                             // This should never happen
     /* purecov: begin tested */
+    /*
+      This can happen in innodb when you get a deadlock when using same table
+      in insert and select
+    */
     my_error(ER_CANT_LOCK, MYF(0), my_errno);
     if (*lock)
     {
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index 27d7460f7fb..a0440aa46f3 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -8311,8 +8311,11 @@ void translog_set_file_size(uint32 size)
    Write debug information to log if we EXTRA_DEBUG is enabled
 */
 
-my_bool translog_log_debug_info(TRN *trn, enum translog_debug_info_type type,
-                                uchar *info, size_t length)
+my_bool translog_log_debug_info(TRN *trn __attribute__((unused)),
+                                enum translog_debug_info_type type
+                                __attribute__((unused)),
+                                uchar *info __attribute__((unused)),
+                                size_t length __attribute__((unused)))
 {
 #ifdef EXTRA_DEBUG
   LEX_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS + 2];
diff --git a/storage/maria/trnman_public.h b/storage/maria/trnman_public.h
index 1871f93b590..89e54be658a 100644
--- a/storage/maria/trnman_public.h
+++ b/storage/maria/trnman_public.h
@@ -75,7 +75,7 @@ uint16 trnman_get_state(TRN *);
 void trnman_set_state(TRN *, uint16 state_bit);
 #else
 #define trnman_get_state(A) 0
-uint16 trnman_set_state(A, B) do { } while (0)
+#define trnman_set_state(A, B) do { } while (0)
 #endif
 
 /* Bits for 'state' */