Commit 76701c6d authored by Jan Lindström's avatar Jan Lindström

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)
parents 3ec139a4 52a91039
...@@ -1478,13 +1478,14 @@ void wsrep_to_isolation_end(THD *thd) ...@@ -1478,13 +1478,14 @@ void wsrep_to_isolation_end(THD *thd)
#define WSREP_MDL_LOG(severity, msg, schema, schema_len, req, gra) \ #define WSREP_MDL_LOG(severity, msg, schema, schema_len, req, gra) \
WSREP_##severity( \ WSREP_##severity( \
"%s\n" \
"schema: %.*s\n" \ "schema: %.*s\n" \
"request: (%lu \tseqno %lld \twsrep (%d, %d, %d) cmd %d %d \t%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)", \ "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->thread_id, (long long)wsrep_thd_trx_seqno(req), \
req->wsrep_exec_mode, req->wsrep_query_state, req->wsrep_conflict_state, \ 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->thread_id, (long long)wsrep_thd_trx_seqno(gra), \
gra->wsrep_exec_mode, gra->wsrep_query_state, gra->wsrep_conflict_state, \ gra->wsrep_exec_mode, gra->wsrep_query_state, gra->wsrep_conflict_state, \
gra->get_command(), gra->lex->sql_command, gra->query()); gra->get_command(), gra->lex->sql_command, gra->query());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment