diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-09 14:54:57 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-09 14:54:57 -0500 |
| commit | 31eaa90a6ef767b4f846bfe454892979200003a1 (patch) | |
| tree | ac63b8be86cc6d9bfc148407fc5631bd342741c8 /sql/mdl.cc | |
| parent | 088c069462d4a5cf26e97690e045fc3e737453a3 (diff) | |
| download | mariadb-git-31eaa90a6ef767b4f846bfe454892979200003a1.tar.gz | |
Merging revision 3839..3932 from codership-mysql/5.5.
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index fe8efd3e6cd..268a6621f65 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -22,6 +22,7 @@ #include <mysql/service_thd_wait.h> #ifdef WITH_WSREP #include "wsrep_mysqld.h" +#include "wsrep_thd.h" extern "C" my_thread_id wsrep_thd_thread_id(THD *thd); extern "C" char *wsrep_thd_query(THD *thd); void sql_print_information(const char *format, ...) @@ -3029,7 +3030,7 @@ void MDL_ticket::wsrep_report(bool debug) { if (debug) { - WSREP_DEBUG("MDL ticket: type: %s space: %s db: %s name: %s (%s)", + WSREP_DEBUG("MDL ticket: type: %s space: %s db: %s name: %s", (get_type() == MDL_INTENTION_EXCLUSIVE) ? "intention exclusive" : ((get_type() == MDL_SHARED) ? "shared" : ((get_type() == MDL_SHARED_HIGH_PRIO ? "shared high prio" : @@ -3049,7 +3050,7 @@ void MDL_ticket::wsrep_report(bool debug) ((m_lock->key.mdl_namespace() == MDL_key::COMMIT) ? "COMMIT" : (char *)"UNKNOWN"))))))), m_lock->key.db_name(), - m_lock->key.name(), + m_lock->key.name(), m_lock->key.get_wait_state_name()); } } |