diff options
| author | mkaruza <mario.karuza@galeracluster.com> | 2021-04-26 11:17:30 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-04-28 11:11:01 +0300 |
| commit | 206d630ea0c1f89f6c3bd2b8d3d62eafa37a2bc2 (patch) | |
| tree | 5eb74e8c5f41abcc449d15944ddf17f5d18c9e7d /sql/sql_class.h | |
| parent | 4cd92143eae9b397589e5b449d1a85c43b3e4f6b (diff) | |
| download | mariadb-git-bb-10.4-MDEV-22227.tar.gz | |
MDEV-22227 Assertion `state_ == s_exec' failed in wsrep::client_state::start_transactionbb-10.4-MDEV-22227
Removed redundant code for BF abort transaction in `thr_lock.cc`.
TOI operations will ignore provided lock_wait_timeout and use `LONG_TIMEOUT`
until operation is finished.
Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index d33cd1b35a4..eb9ea535862 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -615,6 +615,7 @@ typedef struct system_variables are based on the cluster size): */ ulong saved_auto_increment_increment, saved_auto_increment_offset; + ulong saved_lock_wait_timeout; #endif /* WITH_WSREP */ uint eq_range_index_dive_limit; ulong column_compression_zlib_strategy; |