From cc5a472346c016447d37b6e08bec7822007dc94a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Jan 2006 09:25:37 +0100 Subject: 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. --- sql/opt_range.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/opt_range.cc') diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 7dd694f3411..e99bb77c0c7 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -844,7 +844,7 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT() DBUG_PRINT("info", ("Freeing separate handler %p (free=%d)", file, free_file)); file->ha_reset(); - file->external_lock(current_thd, F_UNLCK); + file->ha_external_lock(current_thd, F_UNLCK); file->close(); delete file; } @@ -1008,14 +1008,14 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler) /* Caller will free the memory */ goto failure; } - if (file->external_lock(thd, F_RDLCK)) + if (file->ha_external_lock(thd, F_RDLCK)) goto failure; if (file->extra(HA_EXTRA_KEYREAD) || file->ha_retrieve_all_pk() || init() || reset()) { - file->external_lock(thd, F_UNLCK); + file->ha_external_lock(thd, F_UNLCK); file->close(); goto failure; } -- cgit v1.2.1