diff options
| -rw-r--r-- | client/mysql.cc | 5 | ||||
| -rw-r--r-- | mysql-test/r/mysql.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 1e6207aab51..b102c80655a 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 a70cad308d9..a4d96c1c243 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 05710f44f46..528337da77b 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; |