1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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.
This commit is contained in:
mats@mysql.com
2006-01-26 09:25:37 +01:00
parent 802c94dd9f
commit 5f7956094c
5 changed files with 38 additions and 24 deletions

View File

@ -5254,7 +5254,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
if (!(copy= new Copy_field[to->s->fields]))
DBUG_RETURN(-1); /* purecov: inspected */
if (to->file->external_lock(thd, F_WRLCK))
if (to->file->ha_external_lock(thd, F_WRLCK))
DBUG_RETURN(-1);
/* We can abort alter table for any table type */
@ -5394,7 +5394,7 @@ copy_data_between_tables(TABLE *from,TABLE *to,
free_io_cache(from);
*copied= found_count;
*deleted=delete_count;
if (to->file->external_lock(thd,F_UNLCK))
if (to->file->ha_external_lock(thd,F_UNLCK))
error=1;
DBUG_RETURN(error > 0 ? -1 : 0);
}