diff options
| author | unknown <konstantin@mysql.com> | 2004-02-09 16:40:20 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-02-09 16:40:20 +0300 |
| commit | da81724aa085ee1fbf1c9cc6b3233617d143f902 (patch) | |
| tree | 328bf5392a3650ee9b49a184c23c12e6516a2379 | |
| parent | 74b81a801785058706b46a1e75b67b026c468d04 (diff) | |
| parent | c4d0631b516e62dd66bf8cc3263db133f3dc7108 (diff) | |
| download | mariadb-git-da81724aa085ee1fbf1c9cc6b3233617d143f902.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
| -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 2d2736b20d2..bef567ad346 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -123,7 +123,7 @@ void send_error(THD *thd, uint sql_errno, const char *err) /* Abort multi-result sets */ thd->lex->found_colon= 0; - thd->server_status= ~SERVER_MORE_RESULTS_EXISTS; + thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS; DBUG_VOID_RETURN; } @@ -356,7 +356,7 @@ send_eof(THD *thd, bool no_flush) other queries (see the if test in dispatch_command / COM_QUERY) */ if (thd->is_fatal_error) - thd->server_status= ~SERVER_MORE_RESULTS_EXISTS; + thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS; int2store(buff+3, thd->server_status); VOID(my_net_write(net,(char*) buff,5)); VOID(net_flush(net)); |