diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-03 09:45:39 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-03 09:45:39 +0300 |
commit | 701efbb25b738f0c971798c5234d4d66b9235e47 (patch) | |
tree | 0835d2d3e58ffa8566cf6b1e8211d6484bccc57c /storage/innobase/row/row0umod.cc | |
parent | d5e8b4d7f97c7a15be5d58b6f088c4c64787a385 (diff) | |
parent | 80591481549213f5701642e682cc2974b60c53dd (diff) | |
download | mariadb-git-701efbb25b738f0c971798c5234d4d66b9235e47.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/row/row0umod.cc')
-rw-r--r-- | storage/innobase/row/row0umod.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/row/row0umod.cc b/storage/innobase/row/row0umod.cc index 2fb48f4036a..39f7ddbd79a 100644 --- a/storage/innobase/row/row0umod.cc +++ b/storage/innobase/row/row0umod.cc @@ -964,7 +964,7 @@ row_undo_mod_upd_del_sec( does not exist. However, this situation may only occur during the rollback of incomplete transactions. */ - ut_a(thr_is_recv(thr)); + ut_a(thr_get_trx(thr) == trx_roll_crash_recv_trx); } else { err = row_undo_mod_del_mark_or_remove_sec( node, thr, index, entry); |