diff options
author | konstantin@oak.local <> | 2004-02-09 16:26:38 +0300 |
---|---|---|
committer | konstantin@oak.local <> | 2004-02-09 16:26:38 +0300 |
commit | 12f687db70121b566d477affd358738ec8613641 (patch) | |
tree | 0d9fc3ede38489b92f51506c891bc36c8b36dbc6 /sql/protocol.cc | |
parent | 7e9944d3d54eb7b391ec78686b9a0d90fc26acc8 (diff) | |
download | mariadb-git-12f687db70121b566d477affd358738ec8613641.tar.gz |
switch off SERVER_MORE_RESULTS_EXISTS, but
don't set other flags: it breaks future extensions
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 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)); |