bzr commit into mysql-5.1 branch (mattias.jonsson:3569)

[Mattias Jonsson]

#At file:///Users/mattiasj/mysql-bzr/topush-5.1/ based on revid:ramil@stripped

 3569 Mattias Jonsson	2011-01-26 [merge]
      merge

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-01-18 10:03:44 +0000
+++ b/client/mysqltest.cc	2011-01-26 15:34:34 +0000
@@ -7255,8 +7255,12 @@ void run_query_stmt(MYSQL *mysql, struct
 
       mysql_free_result(res);     /* Free normal result set with meta data */
 
-      /* Clear prepare warnings */
-      dynstr_set(&ds_prepare_warnings, NULL);
+      /*
+        Clear prepare warnings if there are execute warnings,
+        since they are probably duplicated.
+      */
+      if (ds_execute_warnings.length || mysql->warning_count)
+        dynstr_set(&ds_prepare_warnings, NULL);
     }
     else
     {

No bundle (reason: revision is a merge).