diff options
| author | unknown <mats@mysql.com> | 2006-01-26 09:25:37 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-01-26 09:25:37 +0100 |
| commit | a89c10fd9b79a5d4eb42ae7d7ac00130919f456f (patch) | |
| tree | 58efc1a432ec7f374a5e46509bc0a633530a72ba /sql/lock.cc | |
| parent | 4bd027d0ccff79a427fe1900c0dae09225ab5892 (diff) | |
| download | mariadb-git-a89c10fd9b79a5d4eb42ae7d7ac00130919f456f.tar.gz | |
WL#3023 (RBR: Use locks in a statment-like manner):
Interface changes pushed early.
Separation of public and implementation interface for external_lock()
in preparation for implementation.
sql/handler.cc:
Separating public virtual external_lock() into public non-virtual
ha_external_lock() and private virtual external_lock(). Some minor
changes to ha_*_row() function.
sql/handler.h:
Separating public virtual external_lock() into public non-virtual
ha_external_lock() and private virtual external_lock().
sql/lock.cc:
Using new public ha_external_lock instead of internal external_lock.
sql/opt_range.cc:
Using new public ha_external_lock instead of internal external_lock.
sql/sql_table.cc:
Using new public ha_external_lock instead of internal external_lock.
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 8e24c56799d..edc76fbe660 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -229,12 +229,12 @@ static int lock_external(THD *thd, TABLE **tables, uint count) ((*tables)->reginfo.lock_type >= TL_READ && (*tables)->reginfo.lock_type <= TL_READ_NO_INSERT)) lock_type=F_RDLCK; - if ((error=(*tables)->file->external_lock(thd,lock_type))) + if ((error=(*tables)->file->ha_external_lock(thd,lock_type))) { print_lock_error(error, (*tables)->file->table_type()); for (; i-- ; tables--) { - (*tables)->file->external_lock(thd, F_UNLCK); + (*tables)->file->ha_external_lock(thd, F_UNLCK); (*tables)->current_lock=F_UNLCK; } DBUG_RETURN(error); @@ -562,7 +562,7 @@ static int unlock_external(THD *thd, TABLE **table,uint count) if ((*table)->current_lock != F_UNLCK) { (*table)->current_lock = F_UNLCK; - if ((error=(*table)->file->external_lock(thd, F_UNLCK))) + if ((error=(*table)->file->ha_external_lock(thd, F_UNLCK))) { error_code=error; print_lock_error(error_code, (*table)->file->table_type()); |