diff options
| author | unknown <magnus@neptunus.(none)> | 2004-05-10 15:09:19 +0200 |
|---|---|---|
| committer | unknown <magnus@neptunus.(none)> | 2004-05-10 15:09:19 +0200 |
| commit | 5b92b23bbf77f8984c9e1309f516bb6820b9cbce (patch) | |
| tree | 837393b3e3a58f46b2377b5ec5ccad11d77e80db /sql/sql_table.cc | |
| parent | e13340b0a2aa93bfa2c3d3c2e0fde041419a737c (diff) | |
| parent | d6676b0f575b8ec1605fa3cf125b09b073b0a10c (diff) | |
| download | mariadb-git-5b92b23bbf77f8984c9e1309f516bb6820b9cbce.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 55b726293c2..9521e1d909b 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3247,7 +3247,11 @@ copy_data_between_tables(TABLE *from,TABLE *to, error= 1; goto err; } - + + /* Handler must be told explicitly to retrieve all columns, because + this function does not set field->query_id in the columns to the + current query id */ + from->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS); init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1,1); if (handle_duplicates == DUP_IGNORE || handle_duplicates == DUP_REPLACE) |