From 919b5ba6b5c04bbad477a7722d67213953223cf8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 Nov 2003 16:48:21 +0100 Subject: Fixed BUG#1965: Opening a cursor hangs client when malformed select fails and BUG#1966: "select 1 into a" on top-level hangs client include/mysql_com.h: Added no_send_eof flag to NET for SP cursors (the simple read-only version). mysql-test/r/sp-error.result: Added tests for BUG#1965 and BUG#1966. mysql-test/t/sp-error.test: Added tests for BUG#1965 and BUG#1966. sql/net_serv.cc: Added no_send_eof flag to NET for SP cursors (the simple read-only version). sql/protocol.cc: Added no_send_eof flag to NET for SP cursors (the simple read-only version). sql/sp_rcontext.cc: Use net->no_send_eof flag to prevent eofs during cursor open (instead of the dirty vio=0 which didn't work). sql/sp_rcontext.h: Use net->no_send_eof flag to prevent eofs during cursor open (instead of the dirty vio=0 which didn't work). sql/sql_yacc.yy: Give error message if doing SELECT ... INTO localvar even if it's outside an SP. --- sql/sp_rcontext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sp_rcontext.h') diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h index e69ac9bf4b4..6526ed58575 100644 --- a/sql/sp_rcontext.h +++ b/sql/sp_rcontext.h @@ -240,7 +240,7 @@ private: LEX *m_lex; Protocol_cursor *m_prot; my_bool m_isopen; - Vio *m_ovio; // Original vio + my_bool m_nseof; // Original no_send_eof Protocol *m_oprot; // Original protcol MYSQL_ROWS *m_current_row; -- cgit v1.2.1