diff options
| author | Monty <monty@mariadb.org> | 2019-06-27 20:57:01 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-06-27 20:57:25 +0300 |
| commit | f7a4a8719bd59eca27e3e5e467c138853aa63dd5 (patch) | |
| tree | 58f7e6d9f970434bdc77d970536ef1b0db88a9ef /storage/maria | |
| parent | 51c3a5c84023671903af2879c8f85f3dd1e8344d (diff) | |
| download | mariadb-git-f7a4a8719bd59eca27e3e5e467c138853aa63dd5.tar.gz | |
MDEV-14996 kill during FLUSH TABLES FOR EXPORT causes assert
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ha_maria.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 887065ff825..23de1508b05 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -2782,7 +2782,7 @@ int ha_maria::external_lock(THD *thd, int lock_type) changes to commit (rollback shouldn't be tested). */ DBUG_ASSERT(!thd->get_stmt_da()->is_sent() || - thd->killed == KILL_CONNECTION); + thd->killed); /* autocommit ? rollback a transaction */ #ifdef MARIA_CANNOT_ROLLBACK if (ma_commit(trn)) |