Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/home/kostja/mysql/mysql-5.0-12243

tests/mysql_client_test.c

@@ -13911,7 +13911,9 @@ static void test_bug12001()
   /* Create connection that supports multi statements */
   if (!mysql_real_connect(mysql_local, opt_host, opt_user,
                            opt_password, current_db, opt_port,
-                           opt_unix_socket, CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS)) {
+                           opt_unix_socket, CLIENT_MULTI_STATEMENTS |
+                           CLIENT_MULTI_RESULTS))
+  {
     fprintf(stdout, "\n mysql_real_connect() failed");
     exit(1);
   }
@@ -13919,11 +13921,15 @@ static void test_bug12001()
   rc= mysql_query(mysql_local, query);
   myquery(rc);
 
-  do {
-    if (mysql_field_count(mysql_local) && (result= mysql_use_result(mysql_local)))  {
+  do
+  {
+    if (mysql_field_count(mysql_local) &&
+        (result= mysql_use_result(mysql_local)))
+    {
       mysql_free_result(result);
     }
-  } while (!(res= mysql_next_result(mysql_local))); 
+  }
+  while (!(res= mysql_next_result(mysql_local)));
 
   rc= mysql_query(mysql_local, "DROP TABLE IF EXISTS test_table");
   myquery(rc);