diff options
| author | unknown <kostja@bodhi.(none)> | 2007-07-31 20:03:52 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-07-31 20:03:52 +0400 |
| commit | 91f54bf1f7737eefd09ba2fdbe8bad19139e9b4a (patch) | |
| tree | e01a858aa56e916213cf8bdb5392ddf4dce83814 /sql/sql_table.cc | |
| parent | 766725c5025cc53a510487454be09238c849ac77 (diff) | |
| parent | eb6c85e7552dcf63f2b2ed065051f571425d8426 (diff) | |
| download | mariadb-git-91f54bf1f7737eefd09ba2fdbe8bad19139e9b4a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/sql_base.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge.
mysql-test/t/innodb_mysql.test:
Manual merge.
sql/sql_table.cc:
Manual merge.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 7db79543016..cc786c741c1 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3811,7 +3811,7 @@ view_err: The following function call will free the new_table pointer, in close_temporary_table(), so we can safely directly jump to err */ - close_temporary_table(thd,new_db,tmp_name); + close_temporary_table(thd, new_db, tmp_name); goto err; } /* Close lock if this is a transactional table */ @@ -4084,7 +4084,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 need external lock before we can disable/enable keys */ @@ -4236,7 +4236,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); } |