diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-12-10 10:02:25 +0100 |
| commit | 926aaf4635c16f64d46d4fcbbbefb3aefca7a601 (patch) | |
| tree | dca0acd2a01c113582c29effe5312d2ffc0fb398 /sql/sql_update.cc | |
| parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
| parent | 7f91cf0861fb4e318b973c0fe1a2e632e9b587ea (diff) | |
| download | mariadb-git-926aaf4635c16f64d46d4fcbbbefb3aefca7a601.tar.gz | |
Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*
since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index dbdd30552ec..d5d91d856fc 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1748,7 +1748,7 @@ bool multi_update::send_data(List<Item> ¬_used_values) if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE) { if (error && - create_myisam_from_heap(thd, tmp_table, + create_internal_tmp_table_from_heap(thd, tmp_table, tmp_table_param + offset, error, 1)) { do_update= 0; |