database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-08-02 10:11:41 +02:00
parent 07674e6a74 ec8882b9dd
commit 6efb5e9f5e
357 changed files with 8204 additions and 2125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_parse.cc
View File

@@ -2259,11 +2259,10 @@ dispatch_command_return dispatch_command(enum enum_server_command command, 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(),
@@ -5667,6 +5666,11 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
/* 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;
}