diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-02 00:47:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-13 18:12:05 +0100 |
| commit | e46c42217f4fc7ba43992ca54c039f2556d1859f (patch) | |
| tree | cecd39b5d2528eb4ff102e1a86f2a17aec6cc0dc /sql/sql_update.cc | |
| parent | 460ff39871d6554ec17714a79a174cf8f80f7817 (diff) | |
| download | mariadb-git-e46c42217f4fc7ba43992ca54c039f2556d1859f.tar.gz | |
cleanup: TABLE::mark_columns_used_by_index()
mark_columns_used_by_index used to do
reset + mark_columns_used_by_index_no_reset + start keyread + set bitmaps
Now prepare_for_keyread does that, while mark_columns_used_by_index
does only reset + mark_columns_used_by_index_no_reset,
just as its name suggests.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index a74a4c2b761..9c0e9443b0d 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -191,7 +191,7 @@ static void prepare_record_for_error_message(int error, TABLE *table) /* Create unique_map with all fields used by that index. */ my_bitmap_init(&unique_map, unique_map_buf, table->s->fields, FALSE); - table->mark_columns_used_by_index_no_reset(keynr, &unique_map); + table->mark_columns_used_by_index(keynr, &unique_map); /* Subtract read_set and write_set. */ bitmap_subtract(&unique_map, table->read_set); @@ -539,7 +539,7 @@ int mysql_update(THD *thd, MY_BITMAP *save_write_set= table->write_set; if (query_plan.index < MAX_KEY && old_covering_keys.is_set(query_plan.index)) - table->mark_columns_used_by_index(query_plan.index); + table->prepare_for_keyread(query_plan.index); else table->use_all_columns(); |