bzr commit into mysql-trunk branch (alexander.barkov:3679)

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-trunk/ based on revid:alexander.barkov@stripped

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

    modified:
      tests/mysql_client_test.c
=== 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:20:47 +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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).