Merge lp:~hartmut-php/drizzle/drizzle-fix-mysql-bug44732 into lp:~drizzle-trunk/drizzle/development

[Hartmut Holzgraefe]

fix for mysql bug #44732 "mysql client should printing warnings on stderr in batch mode"
which is also present in the drizzle client

[Monty Taylor (mordred)]

Totally.

review: Approve

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2010-05-13 07:58:04 +0000
+++ client/drizzle.cc	2010-05-20 21:11:29 +0000
@@ -3446,6 +3446,7 @@
   drizzle_row_t cur;
   uint64_t num_rows;
   uint32_t new_code= 0;
+  FILE *out;
 
   /* Get the warnings */
   query= "show warnings";
@@ -3471,12 +3472,21 @@
   }
 
   /* Print the warnings */
-  init_pager();
+  if (status.getBatch()) 
+  {
+    out = stderr;
+  } 
+  else 
+  {
+    init_pager();
+    out = PAGER;
+  }
   do
   {
-    tee_fprintf(PAGER, "%s (Code %s): %s\n", cur[0], cur[1], cur[2]);
+    tee_fprintf(out, "%s (Code %s): %s\n", cur[0], cur[1], cur[2]);
   } while ((cur= drizzle_row_next(&result)));
-  end_pager();
+  if (!status.getBatch())
+    end_pager();
 
 end:
   drizzle_result_free(&result);