diff options
| author | unknown <pem@mysql.comhem.se> | 2004-01-09 09:36:37 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2004-01-09 09:36:37 +0100 |
| commit | b092868307a92bfc103df5ebfaf95f3f45b92cd8 (patch) | |
| tree | 727512acc3723695943c2c2e98fb7d75a41f96d5 /sql/sp_rcontext.cc | |
| parent | 03b652cfbf9c06a9d22111d1069ae1926b584af4 (diff) | |
| download | mariadb-git-b092868307a92bfc103df5ebfaf95f3f45b92cd8.tar.gz | |
Fix BUG#2269: Lost connect if stored procedure called before USE
(And some minor correction of cursor open)
sql/sp_head.cc:
Detect some errors that doesn't result in a non-zero return code in
the SP execution loop.
(Also corrected the cursor post_open() call.)
sql/sp_rcontext.cc:
Corrected the semantics of cursor post_open().
sql/sp_rcontext.h:
Corrected the semantics of cursor post_open().
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index f328cdb7285..0b2b20fe3b3 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -153,12 +153,15 @@ sp_cursor::pre_open(THD *thd) } void -sp_cursor::post_open(THD *thd, my_bool isopen) +sp_cursor::post_open(THD *thd, my_bool was_opened) { thd->net.no_send_eof= m_nseof; // Restore the originals thd->protocol= m_oprot; - m_isopen= isopen; - m_current_row= m_prot->data; + if (was_opened) + { + m_isopen= was_opened; + m_current_row= m_prot->data; + } } int |