summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-10-14 05:14:06 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-10-14 05:14:06 -0400
commitddb93b427e4336a931d6d472b74c29c49eb36b93 (patch)
treeaff5cbe9ea4138f2b58eca41107ac0c373359485 /sql/wsrep_mysqld.cc
parent950e6f5b4335fcd30658a6abda53b12077ac75d3 (diff)
downloadmariadb-git-ddb93b427e4336a931d6d472b74c29c49eb36b93.tar.gz
WSREP_TO_ISOLATION_BEGIN should be called with the table list.
Diffstat (limited to 'sql/wsrep_mysqld.cc')
-rw-r--r--sql/wsrep_mysqld.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 2f2a6cdc13c..0158a78a10b 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1091,7 +1091,6 @@ static bool wsrep_prepare_keys_for_isolation(THD* thd,
if (db || table)
{
TABLE_LIST tmp_table;
- MDL_request mdl_request;
memset(&tmp_table, 0, sizeof(tmp_table));
tmp_table.table_name= (char*)table;
@@ -1683,7 +1682,7 @@ wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
}
else if (granted_thd->lex->sql_command == SQLCOM_FLUSH)
{
- WSREP_DEBUG("mdl granted over FLUSH BF");
+ WSREP_DEBUG("MDL granted over FLUSH BF");
ticket->wsrep_report(wsrep_debug);
mysql_mutex_unlock(&granted_thd->LOCK_wsrep_thd);
ret = TRUE;
@@ -1698,7 +1697,7 @@ wsrep_grant_mdl_exception(MDL_context *requestor_ctx,
}
else if (granted_thd->wsrep_query_state == QUERY_COMMITTING)
{
- WSREP_DEBUG("mdl granted, but commiting thd abort scheduled");
+ WSREP_DEBUG("MDL granted, but committing thd abort scheduled");
ticket->wsrep_report(wsrep_debug);
mysql_mutex_unlock(&granted_thd->LOCK_wsrep_thd);
wsrep_abort_thd((void*)request_thd, (void*)granted_thd, 1);