diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2015-04-21 16:22:53 +0300 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 21:20:34 -0400 |
| commit | c66609017b25bf066008a3dec9e3ecd00fc5ce8b (patch) | |
| tree | 9d4ba1a5f17226a9cabc0e8bfd1b704bd9bdde91 /sql/wsrep_mysqld.cc | |
| parent | 045b31c8f45079f617ff6c8a1da09710979bc5f8 (diff) | |
| download | mariadb-git-c66609017b25bf066008a3dec9e3ecd00fc5ce8b.tar.gz | |
Refs codership/mysql-wsrep#113
Protecting non replicated FLUSH session from brute force aborts
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 548db8245c3..1e46d577875 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1499,12 +1499,13 @@ wsrep_grant_mdl_exception(MDL_context *requestor_ctx, mysql_mutex_unlock(&granted_thd->LOCK_wsrep_thd); ret = TRUE; } - else if (granted_thd->lex->sql_command == SQLCOM_FLUSH) + else if (granted_thd->lex->sql_command == SQLCOM_FLUSH || + granted_thd->wsrep_exec_mode == LOCAL_FLUSH) { - WSREP_DEBUG("mdl granted over FLUSH BF"); + WSREP_DEBUG("BF thread waiting for FLUSH"); ticket->wsrep_report(wsrep_debug); mysql_mutex_unlock(&granted_thd->LOCK_wsrep_thd); - ret = TRUE; + ret = FALSE; } else if (request_thd->lex->sql_command == SQLCOM_DROP_TABLE) { |