diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2018-07-16 15:35:16 +0300 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-09-10 19:30:06 +0200 |
| commit | e43bc02e7b2752f0deb88cd1edc24d827e01dca9 (patch) | |
| tree | 21859243568f737b6255e2dc9e9bed9695e17d13 /sql | |
| parent | ff34436a2ecc30a177cb304fd1dce928d8709f45 (diff) | |
| download | mariadb-git-e43bc02e7b2752f0deb88cd1edc24d827e01dca9.tar.gz | |
MDEV-16741 Assertion `m_extra_cache' failed in ha_partition::late_extra_cache
multi_delete sets TABLE::no_cache=1 and should set it to 0 when DELETE is done.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_delete.cc | 1 | ||||
| -rw-r--r-- | sql/sql_update.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 8aca415a9d0..cdd7350cb0c 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -744,6 +744,7 @@ multi_delete::~multi_delete() { TABLE *table= table_being_deleted->table; table->no_keyread=0; + table->no_cache= 0; } for (uint counter= 0; counter < num_of_tables; counter++) diff --git a/sql/sql_update.cc b/sql/sql_update.cc index e42f6a4ff76..fe007d5823d 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1868,7 +1868,7 @@ multi_update::~multi_update() TABLE_LIST *table; for (table= update_tables ; table; table= table->next_local) { - table->table->no_keyread= table->table->no_cache= 0; + table->table->no_keyread= 0; if (ignore) table->table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); } |