From 53cf19216fb06d794fbdab56f2fb34b3e327b66b Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Mon, 26 Nov 2007 19:50:43 +0100
Subject: [PATCH] Bug#25146 Some warnings/errors not shown when using
 --show-warnings  - Additional patch to fix compiler warnings

client/mysql.cc:
  Initialize warnings to 0 to avid compiler warning
  Call 'print_warnings' also when error occured
mysql-test/r/mysql.result:
  Change test to make is possible to see that second set of warnings
  are from second invocation of mysql
mysql-test/t/mysql.test:
  Change test to make is possible to see that second set of warnings
  are from second invocation of mysql
---
 client/mysql.cc           | 5 +++--
 mysql-test/r/mysql.result | 2 +-
 mysql-test/t/mysql.test   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index 1e6207aab5..b102c80655 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2166,7 +2166,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
 {
   char		buff[200], time_buff[32], *pos;
   MYSQL_RES	*result;
-  ulong		timer, warnings;
+  ulong		timer, warnings= 0;
   uint		error= 0;
   int           err= 0;
 
@@ -2316,7 +2316,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
 
 end:
 
-  if (show_warnings == 1 && warnings >= 1) /* Show warnings if any */
+ /* Show warnings if any or error occured */
+  if (show_warnings == 1 && (warnings >= 1 || error))
     print_warnings();
 
   if (!error && !status.batch && 
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index a70cad308d..a4d96c1c24 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -184,7 +184,7 @@ End of 5.0 tests
 WARNING: --server-arg option not supported in this configuration.
 Warning (Code 1286): Unknown table engine 'nonexistent'
 Warning (Code 1266): Using storage engine MyISAM for table 't2'
-Warning (Code 1286): Unknown table engine 'nonexistent'
+Warning (Code 1286): Unknown table engine 'nonexistent2'
 Warning (Code 1266): Using storage engine MyISAM for table 't2'
 Error (Code 1050): Table 't2' already exists
 drop tables t1, t2;
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 05710f44f4..528337da77 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -312,7 +312,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug29323.sql;
 
 # This should fail, with warnings as well
 --error 1
---exec $MYSQL --show-warnings test -e "create table t2 (id int) engine=nonexistent"
+--exec $MYSQL --show-warnings test -e "create table t2 (id int) engine=nonexistent2"
 
 drop tables t1, t2;
 
-- 
2.30.9