diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-10-19 14:17:36 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-10-19 14:17:36 +0300 |
| commit | 76701c6d3426db99f80978718bd0f6628ce85e6a (patch) | |
| tree | 27abd6008363ab09748a5c5c7e7085e261d52777 | |
| parent | 3ec139a4afc7e9d367902deb546b941ca25a51d0 (diff) | |
| parent | 52a910395a18088af5988883989274066bb212d8 (diff) | |
| download | mariadb-git-76701c6d3426db99f80978718bd0f6628ce85e6a.tar.gz | |
Merge pull request #105 from philip-galera/10.0-galera-mysql-wsrep-gh202
refs codership/mysql-wsrep#202 Fix bad cherry-pick (and the compiler warnings it generated)
| -rw-r--r-- | sql/wsrep_mysqld.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index a9cdb5b5b11..31a642e3624 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1478,13 +1478,14 @@ void wsrep_to_isolation_end(THD *thd) #define WSREP_MDL_LOG(severity, msg, schema, schema_len, req, gra) \ WSREP_##severity( \ + "%s\n" \ "schema: %.*s\n" \ "request: (%lu \tseqno %lld \twsrep (%d, %d, %d) cmd %d %d \t%s)\n" \ "granted: (%lu \tseqno %lld \twsrep (%d, %d, %d) cmd %d %d \t%s)", \ - msg, schema_len, schema, \ + msg, schema_len, schema, \ req->thread_id, (long long)wsrep_thd_trx_seqno(req), \ req->wsrep_exec_mode, req->wsrep_query_state, req->wsrep_conflict_state, \ - req->get_command(), req->lex->sql_command, req->query(), \ + req->get_command(), req->lex->sql_command, req->query(), \ gra->thread_id, (long long)wsrep_thd_trx_seqno(gra), \ gra->wsrep_exec_mode, gra->wsrep_query_state, gra->wsrep_conflict_state, \ gra->get_command(), gra->lex->sql_command, gra->query()); |