summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2005-01-20 10:41:37 +0200
committerunknown <bell@sanja.is.com.ua>2005-01-20 10:41:37 +0200
commit7a528488915786f56ab48e2995fae18cc9731d1a (patch)
tree688e14daabde23993878846e8b67af1f4d180abf /sql/net_serv.cc
parent06284149809d85e347af94a8ba2568d0ba5c0e2d (diff)
downloadmariadb-git-7a528488915786f56ab48e2995fae18cc9731d1a.tar.gz
Fixed problem of sending ERROR to client after OK or EOF (BUG#6804)
include/mysql_com.h: Flag which prevent sending error after EOF or OK sent mysql-test/r/kill.result: test of blocking of sending ERROR after OK or EOF mysql-test/t/kill.test: test of blocking of sending ERROR after OK or EOF sql/item_func.cc: typo fixed sql/net_serv.cc: initialization of flag sql/protocol.cc: check and set of flag no_send_error sql/sql_parse.cc: droping flag no_send_error before new command/query execution
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index bd3bbe3e1a9..2de5853599f 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -121,8 +121,7 @@ my_bool my_net_init(NET *net, Vio* vio)
DBUG_RETURN(1);
net->buff_end=net->buff+net->max_packet;
net->vio = vio;
- net->no_send_ok = 0;
- net->no_send_eof = 0;
+ net->no_send_ok= net->no_send_eof= net->no_send_error= 0;
net->error=0; net->return_errno=0; net->return_status=0;
net->pkt_nr=net->compress_pkt_nr=0;
net->write_pos=net->read_pos = net->buff;