diff options
| author | serg@serg.mylan <> | 2005-03-09 14:09:06 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-03-09 14:09:06 +0100 |
| commit | 956682de1a15d974e6ad034218bb14fa1d17a370 (patch) | |
| tree | 4625d7f51e27bb495a5f571cfcad95a20d34e4a9 /sql/protocol.cc | |
| parent | c49928447df13564ad8c657bf01d8010c9732d0c (diff) | |
| parent | c64b47fc0e4e834b0d7a449f6f948893e790e902 (diff) | |
| download | mariadb-git-956682de1a15d974e6ad034218bb14fa1d17a370.tar.gz | |
merged
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index a05f4c6079b..f84be5b1947 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -252,8 +252,9 @@ net_printf_error(THD *thd, uint errcode, ...) strmake(net->last_error, text_pos, length); strmake(net->sqlstate, mysql_errno_to_sqlstate(errcode), SQLSTATE_LENGTH); #endif - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode, - text_pos ? text_pos : ER(errcode)); + if (!thd->killed) + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode, + text_pos ? text_pos : ER(errcode)); thd->is_fatal_error=0; // Error message is given DBUG_VOID_RETURN; } |