database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

find_all_keys: add an assert, remove current_thd

Browse Source 
Filesort temporarily changes read_set to be tmp_set and marks only
fields needed for filesort. Add an assert to ensure that it doesn't
overwrite the old value of tmp_set, that is that read_set was *not*
already tmp_set when filesort was invoked.

Fix sql_update.cc that was was doing exactly that - changing read_set to
tmp_set, configuring tmp_set for keyread, and then invoking filesort.
This commit is contained in:
Sergei Golubchik
2017-02-03 19:09:19 +01:00
parent e46c42217f
commit dafb507e3e
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sql/sql_update.cc
View File

@@ -534,16 +534,9 @@ int mysql_update(THD *thd,
/*
We can't update table directly; We must first search after all
matching rows before updating the table!
note: We avoid sorting if we sort on the used index
*/
MY_BITMAP *save_read_set= table->read_set;
MY_BITMAP *save_write_set= table->write_set;
if (query_plan.index < MAX_KEY && old_covering_keys.is_set(query_plan.index))
table->prepare_for_keyread(query_plan.index);
else
table->use_all_columns();
/* note: We avoid sorting if we sort on the used index */
if (query_plan.using_filesort)
{
/*
@@ -569,6 +562,14 @@ int mysql_update(THD *thd,
}
else
{
MY_BITMAP *save_read_set= table->read_set;
MY_BITMAP *save_write_set= table->write_set;
if (query_plan.index < MAX_KEY && old_covering_keys.is_set(query_plan.index))
table->prepare_for_keyread(query_plan.index);
else
table->use_all_columns();
/*
We are doing a search on a key that is updated. In this case
we go trough the matching rows, save a pointer to them and
@@ -681,9 +682,10 @@ int mysql_update(THD *thd,
select->file=tempfile; // Read row ptrs from this file
if (error >= 0)
goto err;
table->file->ha_end_keyread();
table->column_bitmaps_set(save_read_set, save_write_set);
}
table->file->ha_end_keyread();
table->column_bitmaps_set(save_read_set, save_write_set);
}
if (ignore)