Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-root
This commit is contained in:
unknown 2004-02-09 16:40:20 +03:00
commit da81724aa0

View file

@ -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));