diff options
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 19f80606e34..64aca9fb87d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2264,11 +2264,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd, size_t length= #endif my_snprintf(buff, buff_len - 1, - "Uptime: %lu Threads: %d Questions: %lu " + "Uptime: %lu Threads: %u Questions: %lu " "Slow queries: %lu Opens: %lu " "Open tables: %u Queries per second avg: %u.%03u", - uptime, - (int) thread_count, (ulong) thd->query_id, + uptime, THD_count::value(), (ulong) thd->query_id, current_global_status_var->long_query_count, current_global_status_var->opened_tables, tc_records(), @@ -5726,6 +5725,11 @@ mysql_execute_command(THD *thd) /* Begin transaction with the same isolation level. */ if (tx_chain) { +#ifdef WITH_WSREP + /* If there are pending changes after rollback we should clear them */ + if (wsrep_on(thd) && wsrep_has_changes(thd)) + wsrep_after_statement(thd); +#endif if (trans_begin(thd)) goto error; } |