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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-26 11:50:32 +02:00
parent e9e1890162 2e67b9f665
commit 356c149603
74 changed files with 151 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mytop.sh
View File

@@ -348,7 +348,7 @@ if ($has_is_processlist == 1)
if ($has_time_ms == 1)
{
## Check if the server has the STAGE column on the I_S.PROCESSLIST
## table (MariaDB) to retreive query completion informations
## table (MariaDB) to retreive query completion information
$has_progress = Execute("SELECT /*mytop*/ 1 FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA = 'information_schema' AND
TABLE_NAME = 'PROCESSLIST' AND
@@ -853,7 +853,7 @@ while (1)
}
## a - progress column toggle (the column is only displayed
## if progress informations are available from the processlist)
## if progress information are available from the processlist)
if ($key eq 'a')
{