diff options
| author | Monty <monty@mariadb.org> | 2018-08-27 22:00:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-08-27 22:00:14 +0300 |
| commit | cded083a370f4b23c6d895d44f2948c267ed5e77 (patch) | |
| tree | f51e5d0dd27f9df2394718c2b6ddde3510ff9fb6 /wsrep | |
| parent | b87b8c13445a631de28e47a8f4ccdc10c47534d4 (diff) | |
| download | mariadb-git-cded083a370f4b23c6d895d44f2948c267ed5e77.tar.gz | |
MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexes
Problem was that a parallel open of a table, overwrote info->state that
was in used by repair.
Fixed by changing _ma_tmp_disable_logging_for_table() to use
a new state buffer state.no_logging to store the temporary state.
Other things:
- Use original number of rows when retrying repair to get rid of a
potential warning "Number of rows changed from X to Y"
- Changed maria_commit() to make it easier to merge with 10.4
- If table is not locked (like with show commands), use the global
number of rows as the local number may not be up to date.
(Minor not critical fix)
- Added some missing DBUG_RETURN
Diffstat (limited to 'wsrep')
0 files changed, 0 insertions, 0 deletions