mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-19629 post-merge fixes
* it isn't "pfs" function, don't call it Item_func_pfs, don't use item_pfsfunc.* * tests don't depend on performance schema, put in the main suite * inherit from Item_str_ascii_func * use connection collation, not utf8mb3_general_ci * set result length in fix_length_and_dec * do not set maybe_null * use my_snprintf() where possible * don't set m_value.ptr on every invocation * update sys schema to use the format_pico_time() * len must be size_t (compilation error on Windows) * the correct function name for double->double is fabs() * drop volatile hack
This commit is contained in:
@ -240,8 +240,8 @@ BEGIN
|
||||
SELECT "SUMMARY STATISTICS";
|
||||
|
||||
SELECT COUNT(*) executions,
|
||||
sys.format_time(SUM(timer_wait)) AS exec_time,
|
||||
sys.format_time(SUM(lock_time)) AS lock_time,
|
||||
format_pico_time(SUM(timer_wait)) AS exec_time,
|
||||
format_pico_time(SUM(lock_time)) AS lock_time,
|
||||
SUM(rows_sent) AS rows_sent,
|
||||
SUM(rows_affected) AS rows_affected,
|
||||
SUM(rows_examined) AS rows_examined,
|
||||
@ -251,7 +251,7 @@ BEGIN
|
||||
|
||||
SELECT event_name,
|
||||
COUNT(*) as count,
|
||||
sys.format_time(SUM(timer_wait)) as latency
|
||||
format_pico_time(SUM(timer_wait)) as latency
|
||||
FROM stmt_stages
|
||||
GROUP BY event_name
|
||||
ORDER BY SUM(timer_wait) DESC;
|
||||
@ -259,8 +259,8 @@ BEGIN
|
||||
SELECT "LONGEST RUNNING STATEMENT";
|
||||
|
||||
SELECT thread_id,
|
||||
sys.format_time(timer_wait) AS exec_time,
|
||||
sys.format_time(lock_time) AS lock_time,
|
||||
format_pico_time(timer_wait) AS exec_time,
|
||||
format_pico_time(lock_time) AS lock_time,
|
||||
rows_sent,
|
||||
rows_affected,
|
||||
rows_examined,
|
||||
@ -279,7 +279,7 @@ BEGIN
|
||||
|
||||
IF (@sql_id IS NOT NULL) THEN
|
||||
SELECT event_name,
|
||||
sys.format_time(timer_wait) as latency
|
||||
format_pico_time(timer_wait) as latency
|
||||
FROM stmt_stages
|
||||
WHERE stmt_id = @sql_id
|
||||
ORDER BY event_id;
|
||||
|
Reference in New Issue
Block a user