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

Merge 11.1 into 11.2

Browse Source
This commit is contained in:
Marko Mäkelä
2023-07-26 15:49:24 +03:00
parent 742f960eeb c6ac1e39b6
commit e81fa34502
212 changed files with 4735 additions and 2471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.cc
View File

@@ -5826,6 +5826,7 @@ void THD::store_slow_query_state(Sub_statement_state *backup)
backup->tmp_tables_disk_used= tmp_tables_disk_used;
backup->tmp_tables_size= tmp_tables_size;
backup->tmp_tables_used= tmp_tables_used;
backup->handler_stats= handler_stats;
}
/* Reset variables related to slow query log */
@@ -5841,6 +5842,8 @@ void THD::reset_slow_query_state()
tmp_tables_disk_used= 0;
tmp_tables_size= 0;
tmp_tables_used= 0;
if ((variables.log_slow_verbosity & LOG_SLOW_VERBOSITY_ENGINE))
handler_stats.reset();
}
/*
@@ -5859,6 +5862,8 @@ void THD::add_slow_query_state(Sub_statement_state *backup)
tmp_tables_disk_used+= backup->tmp_tables_disk_used;
tmp_tables_size+= backup->tmp_tables_size;
tmp_tables_used+= backup->tmp_tables_used;
if ((variables.log_slow_verbosity & LOG_SLOW_VERBOSITY_ENGINE))
handler_stats.add(&backup->handler_stats);
}