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 | 740c0d3a87c07dd5f482db5705449143993e7385 (patch) | |
tree | d2ba1f5d61c494084a89dffb85b4cb0b3afd9beb /sql/sql_cursor.h | |
parent | 36290c092392c460132f3d7256aeeb8f94debe8f (diff) | |
download | mariadb-git-740c0d3a87c07dd5f482db5705449143993e7385.tar.gz |
Implement WL#5502 Remove dead 5.0 class Sensitive_cursor.
Remove dead and unused code.
Update to reflect the code review requests.
include/thr_lock.h:
Remove declarations for THR_LOCK_OWNER,
added along with the patch for sensitive cursors.
mysys/thr_lock.c:
Remove support for multiple thr_lock requestors
per THD.
sql/lock.cc:
Revert the patch that added support for sensitive cursors.
sql/sp_rcontext.cc:
Updated the use of mysql_open_cursor().
sql/sql_class.cc:
Move the instance of Server_side_cursor
from class Prepared_statement to class Statement.
sql/sql_class.h:
Move the isntance of Server_side_cursor
from class Prepared_statement to class
Statement.
Remove multiple lock_ids of thr_lock.
sql/sql_cursor.cc:
Remove Sensitive_cursor implementation.
sql/sql_cursor.h:
Remove declarations for sensitive cursors.
sql/sql_prepare.cc:
Move the declaration of instance of Server_side_cursor
from class Statement to class Prepared_statement,
where it's used.
sql/sql_select.cc:
Remove sensitive cursor support.
sql/sql_select.h:
Remove sensitive cursor support.
sql/sql_union.cc:
Remove sensitive cursor support.
Diffstat (limited to 'sql/sql_cursor.h')
-rw-r--r-- | sql/sql_cursor.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sql/sql_cursor.h b/sql/sql_cursor.h index 2a394e281b4..ed7bfac821a 100644 --- a/sql/sql_cursor.h +++ b/sql/sql_cursor.h @@ -32,11 +32,11 @@ class JOIN; */ /** - Server_side_cursor -- an interface for materialized and - sensitive (non-materialized) implementation of cursors. All - cursors are self-contained (created in their own memory root). - For that reason they must be deleted only using a pointer to - Server_side_cursor, not to its base class. + Server_side_cursor -- an interface for materialized + implementation of cursors. All cursors are self-contained + (created in their own memory root). For that reason they must + be deleted only using a pointer to Server_side_cursor, not to + its base class. */ class Server_side_cursor: protected Query_arena, public Sql_alloc @@ -60,11 +60,7 @@ public: }; -int mysql_open_cursor(THD *thd, uint flags, - select_result *result, +int mysql_open_cursor(THD *thd, select_result *result, Server_side_cursor **res); -/** Possible values for flags */ -enum { ANY_CURSOR= 1, ALWAYS_MATERIALIZED_CURSOR= 2 }; - #endif /* _sql_cusor_h_ */ |