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/lock.cc | |
| 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/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 7c0acb58e7c..1a77b576e67 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -313,7 +313,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, uint flags) rc= thr_lock_errno_to_mysql[(int) thr_multi_lock(sql_lock->locks + sql_lock->lock_count, sql_lock->lock_count, - thd->lock_id, timeout)]; + &thd->lock_info, timeout)]; if (rc) { if (sql_lock->table_count) |