diff options
author | magnus@neptunus.(none) <> | 2004-05-07 16:21:54 +0200 |
---|---|---|
committer | magnus@neptunus.(none) <> | 2004-05-07 16:21:54 +0200 |
commit | 97ffc1f4088be3af92e0ebce61cbeafaa7277a90 (patch) | |
tree | e4b6acc868f9d32e58b99cdec93e8ebdb3cee4b2 /sql/sql_table.cc | |
parent | 5c4f83bbd9387d45636e16a14ae4284166a0e675 (diff) | |
parent | 1d8bf1cb18bccb607c087b3ce2243bb9487e7d7c (diff) | |
download | mariadb-git-97ffc1f4088be3af92e0ebce61cbeafaa7277a90.tar.gz |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
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 d1a2e0e20d6..3bc1d67835d 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3222,7 +3222,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) |