summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/sql_base.cc4
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
}