diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-10-23 22:38:11 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-10-23 22:38:11 +0300 |
| commit | ef6f9a8250804efb047ad6f28e476c59d7223e85 (patch) | |
| tree | 4dca03b7badc2e826110921392fb351fd07e80a3 /sql/mdl.cc | |
| parent | 20df56c1002e809daa68fa7431a9dd7e3d899642 (diff) | |
| download | mariadb-git-ef6f9a8250804efb047ad6f28e476c59d7223e85.tar.gz | |
References lp:1066784
merged with patch: bzr diff lp:codership-mysql/5.5 -r3795..3809
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 8ff420e4f50..2e279c19592 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1575,6 +1575,14 @@ MDL_lock::can_grant_lock(enum_mdl_type type_arg, else if (!wsrep_grant_mdl_exception(requestor_ctx, ticket)) { wsrep_can_grant= FALSE; + if (wsrep_log_conflicts) + { + MDL_lock * lock = ticket->get_lock(); + WSREP_INFO( + "MDL conflict db=%s table=%s ticket=%d solved by %s", + lock->key.db_name(), lock->key.name(), ticket->get_type(), "abort" + ); + } } else { |