database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-27 20:41:31 +03:00
parent acf6f92aa9 00377147e3
commit 4d59f45260
39 changed files with 547 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_update.cc
View File

@ -256,6 +256,14 @@ static void prepare_record_for_error_message(int error, TABLE *table)
bitmap_union(table->read_set, &unique_map);
/* Tell the engine about the new set. */
table->file->column_bitmaps_signal();
if ((error= table->file->ha_index_or_rnd_end()) ||
(error= table->file->ha_rnd_init(0)))
{
table->file->print_error(error, MYF(0));
DBUG_VOID_RETURN;
}
/* Read record that is identified by table->file->ref. */
(void) table->file->ha_rnd_pos(table->record[1], table->file->ref);
/* Copy the newly read columns into the new record. */