diff options
author | paul@ice.snake.net <> | 2003-11-20 21:16:45 -0600 |
---|---|---|
committer | paul@ice.snake.net <> | 2003-11-20 21:16:45 -0600 |
commit | 0a5af4448023fabe2c7294a1ca03e0a6c25e925e (patch) | |
tree | f2eeb7a0a664a31f9501f6e5c189eb8c5fbe39ab /sql/protocol.cc | |
parent | 9cf6cf83707f1bdad68bbe049fd459a2c5d25f76 (diff) | |
parent | 8aeb63dd3bc0a7c7ec1cda701f721591929c41e3 (diff) | |
download | mariadb-git-0a5af4448023fabe2c7294a1ca03e0a6c25e925e.tar.gz |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r-- | sql/protocol.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 884569d334a..e1347ff3c6f 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -302,6 +302,8 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message) pos=net_store_data((char*) pos, message, strlen(message)); VOID(my_net_write(net,buff,(uint) (pos-buff))); VOID(net_flush(net)); + /* We can't anymore send an error to the client */ + thd->net.report_error= 0; DBUG_VOID_RETURN; } |