diff options
| author | mkaruza <mario.karuza@galeracluster.com> | 2018-08-29 16:45:28 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-09-12 12:56:24 +0300 |
| commit | 16384fae63ed37e2115cb0d694d817bf0104dd46 (patch) | |
| tree | 21046917ba19dab680b008a42fdbdd3910bba254 | |
| parent | e46b2a3e94ac1e3413b5a650cb4410cc02bef1cd (diff) | |
| download | mariadb-git-16384fae63ed37e2115cb0d694d817bf0104dd46.tar.gz | |
MDEV-15845 Test failure on galera.galera_concurrent_ctas
While executing CTAS galera applier thread can cause CTAS to abort and rollback. Rollback can take time causing applier thread to shutdown node after serial unsuccessful retries to apply transaction. Don't set lock_wait_timeout to zero to wait for lock.
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index dc1122ffad8..fecb5686541 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4379,6 +4379,10 @@ lock_table_names(THD *thd, const DDL_options_st &options, mdl_requests.push_front(&global_request); if (create_table) + #ifdef WITH_WSREP + if (thd->lex->sql_command != SQLCOM_CREATE_TABLE && + thd->wsrep_exec_mode != REPL_RECV) + #endif lock_wait_timeout= 0; // Don't wait for timeout } |