diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-07-27 16:42:36 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-07-27 16:42:36 +0400 |
| commit | 6d059673f7dc1dbff5e154b0ca6d1ef2f0fa3cc3 (patch) | |
| tree | d2ba1f5d61c494084a89dffb85b4cb0b3afd9beb /sql/sql_prepare.cc | |
| parent | ec2c3bf2c1c27e4401c767a6cdcb3172453ff42c (diff) | |
| download | mariadb-git-6d059673f7dc1dbff5e154b0ca6d1ef2f0fa3cc3.tar.gz | |
Implement WL#5502 Remove dead 5.0 class Sensitive_cursor.
Remove dead and unused code.
Update to reflect the code review requests.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 151a135125e..bbdac26d985 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -152,6 +152,7 @@ public: THD *thd; Select_fetch_protocol_binary result; Item_param **param_array; + Server_side_cursor *cursor; uint param_count; uint last_errno; uint flags; @@ -2672,7 +2673,6 @@ void mysqld_stmt_fetch(THD *thd, char *packet, uint packet_length) if (!cursor->is_open()) { stmt->close_cursor(); - thd->cursor= 0; reset_stmt_params(stmt); } @@ -3010,6 +3010,7 @@ Prepared_statement::Prepared_statement(THD *thd_arg) thd(thd_arg), result(thd_arg), param_array(0), + cursor(0), param_count(0), last_errno(0), flags((uint) IS_IN_USE) @@ -3751,8 +3752,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor) /* Go! */ if (open_cursor) - error= mysql_open_cursor(thd, (uint) ALWAYS_MATERIALIZED_CURSOR, - &result, &cursor); + error= mysql_open_cursor(thd, &result, &cursor); else { /* |