bzr push into mysql-trunk branch (alexander.barkov:3679 to 3680)

[Alexander Barkov]

 3680 Alexander Barkov	2011-02-18 [merge]
      Merging from 5.5

    modified:
      tests/mysql_client_test.c
 3679 Jon Olav Hauglid	2011-02-18
      Followup to Bug #11752069 (former bug 43152)
      Assertion `bitmap_is_set_all(&table->s->all_set)' failed in
      handler::ha_reset
      
      This patch refactors four my_bitmap functions that were macros
      in non-DEBUG builds and inline functions in DEBUG builds.
      The patch changes them to only have inline function implementations.
      
      This simplifies code, makes non-DEBUG and DEBUG builds more similar
      and removes bug-prone macros.

    modified:
      include/my_bitmap.h
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2011-02-18 13:25:36 +0000
+++ b/tests/mysql_client_test.c	2011-02-18 14:22:03 +0000
@@ -19313,7 +19313,7 @@ static void test_bug58036()
     if (!opt_silent)
       printf("mysql_real_connect() succeeded (failure expected)\n");
     mysql_close(conn);
-    DIE();
+    DIE("");
   }
 
   if (!opt_silent)
@@ -19339,7 +19339,7 @@ static void test_bug58036()
       printf("mysql_real_connect() failed: %s (%d)\n",
              mysql_error(conn), mysql_errno(conn));
     mysql_close(conn);
-    DIE();
+    DIE("");
   }
 
   mysql_options(conn, MYSQL_SET_CHARSET_NAME, "ucs2");
@@ -19348,7 +19348,7 @@ static void test_bug58036()
     if (!opt_silent)
       printf("mysql_change_user() succedded, error expected!");
     mysql_close(conn);
-    DIE();
+    DIE("");
   }
 
   if (!opt_silent)

No bundle (reason: useless for push emails).