diff options
| author | unknown <serg@serg.mylan> | 2005-03-09 19:22:30 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-09 19:22:30 +0100 |
| commit | d1b3c64b230e35dccf33ac7bb70bdd52f779536b (patch) | |
| tree | f16bb48edb46705380ea8ac84c64b53a1a81b163 /sql/protocol.cc | |
| parent | cd4961830ef37a6c4470ec22fecdf308fc307a46 (diff) | |
| download | mariadb-git-d1b3c64b230e35dccf33ac7bb70bdd52f779536b.tar.gz | |
after merge fixes
mysql-test/r/fulltext.result:
after merge - test results updated
sql/sql_class.cc:
protection
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index f84be5b1947..71908d2a958 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -60,7 +60,7 @@ void net_send_error(THD *thd, uint sql_errno, const char *err) char buff[MYSQL_ERRMSG_SIZE+2], *pos; #endif NET *net= &thd->net; - bool generate_warning= 1; + bool generate_warning= thd->killed != THD::KILL_CONNECTION; DBUG_ENTER("net_send_error"); DBUG_PRINT("enter",("sql_errno: %d err: %s", sql_errno, err ? err : net->last_error[0] ? @@ -252,7 +252,7 @@ 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 - if (!thd->killed) + if (thd->killed != THD::KILL_CONNECTION) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode, text_pos ? text_pos : ER(errcode)); thd->is_fatal_error=0; // Error message is given |