diff options
| author | unknown <guilhem@mysql.com> | 2006-06-02 22:22:59 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2006-06-02 22:22:59 +0200 |
| commit | 78e288b4a7efc9fc4bfd0cc8949e265be48f1ee7 (patch) | |
| tree | 025336cab0c9822d03d387ce26f536a8b0d0712e /sql/sql_table.cc | |
| parent | 0c68b7104fb92ff0998c17d2b71534ec23a7f8ad (diff) | |
| parent | e63f3779d4b19acddbc561e989293b7b4f0559d4 (diff) | |
| download | mariadb-git-78e288b4a7efc9fc4bfd0cc8949e265be48f1ee7.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/mysql_src/mysql-5.1-new-WL3146-handler
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index f28a70c05bc..f39e4e77d70 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6142,7 +6142,7 @@ copy_data_between_tables(TABLE *from,TABLE *to, MODE_STRICT_ALL_TABLES)); from->file->info(HA_STATUS_VARIABLE); - to->file->start_bulk_insert(from->file->records); + to->file->ha_start_bulk_insert(from->file->records); save_sql_mode= thd->variables.sql_mode; @@ -6262,7 +6262,7 @@ copy_data_between_tables(TABLE *from,TABLE *to, free_io_cache(from); delete [] copy; // This is never 0 - if (to->file->end_bulk_insert() && error <= 0) + if (to->file->ha_end_bulk_insert() && error <= 0) { to->file->print_error(my_errno,MYF(0)); error=1; |