diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:04:09 +0300 |
| commit | bc145193c164b895a52b943e73fff53952d48a60 (patch) | |
| tree | 278a02f85834d7ed8fa6933959e9b3b96655d1e1 /storage/innobase/row/row0undo.cc | |
| parent | 1f1a61cfc41a01ffa65d568eebdc037a54b5c463 (diff) | |
| parent | bfb0726fc24acb896e54bc7ef7536ad1aab9d574 (diff) | |
| download | mariadb-git-bc145193c164b895a52b943e73fff53952d48a60.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/row/row0undo.cc')
| -rw-r--r-- | storage/innobase/row/row0undo.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/row/row0undo.cc b/storage/innobase/row/row0undo.cc index 3f960235f3e..a78de7c7e80 100644 --- a/storage/innobase/row/row0undo.cc +++ b/storage/innobase/row/row0undo.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -129,6 +129,7 @@ row_undo_node_create( undo_node_t* undo; ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE) + || trx_state_eq(trx, TRX_STATE_PREPARED_RECOVERED) || trx_state_eq(trx, TRX_STATE_PREPARED)); ut_ad(parent); |