diff options
| author | pem@mysql.comhem.se <> | 2003-11-27 16:48:21 +0100 |
|---|---|---|
| committer | pem@mysql.comhem.se <> | 2003-11-27 16:48:21 +0100 |
| commit | d8bf426b807ae612c6d062df834b039e1e48ca11 (patch) | |
| tree | 3a86abe034e95159e4c892c732cf94688e9f0710 /sql/sp_rcontext.cc | |
| parent | d8603604e84ade0a07a95188643a68855e2f6ca1 (diff) | |
| download | mariadb-git-d8bf426b807ae612c6d062df834b039e1e48ca11.tar.gz | |
Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
and BUG#1966: "select 1 into a" on top-level hangs client
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index 07fd08b0074..a25cd9ee63e 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -149,15 +149,15 @@ sp_cursor::pre_open(THD *thd) m_oprot= thd->protocol; // Save the original protocol thd->protocol= m_prot; - m_ovio= thd->net.vio; // Prevent send_eof() - thd->net.vio= 0; + m_nseof= thd->net.no_send_eof; + thd->net.no_send_eof= TRUE; return m_lex; } void sp_cursor::post_open(THD *thd, my_bool isopen) { - thd->net.vio= m_ovio; // Restore the originals + thd->net.no_send_eof= m_nseof; // Restore the originals thd->protocol= m_oprot; m_isopen= isopen; m_current_row= m_prot->data; |