bzr commit into MySQL/Maria:mysql-maria branch (monty:2721)

[Michael Widenius]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:monty@stripped

 2721 Michael Widenius	2009-01-16
      Fixed issues in last push found by pushbuild
modified:
  sql/sql_insert.cc
  storage/maria/ma_loghandler.c
  storage/maria/trnman_public.h

per-file messages:
  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
=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2009-01-15 22:25:53 +0000
+++ b/sql/sql_insert.cc	2009-01-16 09:38:02 +0000
@@ -3493,8 +3493,11 @@ static TABLE *create_table_from_items(TH
                                     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)
     {

=== modified file 'storage/maria/ma_loghandler.c'
--- a/storage/maria/ma_loghandler.c	2009-01-15 22:25:53 +0000
+++ b/storage/maria/ma_loghandler.c	2009-01-16 09:38:02 +0000
@@ -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];

=== modified file 'storage/maria/trnman_public.h'
--- a/storage/maria/trnman_public.h	2009-01-15 22:25:53 +0000
+++ b/storage/maria/trnman_public.h	2009-01-16 09:38:02 +0000
@@ -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' */