mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +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:
@ -26,7 +26,9 @@ CREATE DEFINER='mariadb.sys'@'localhost' FUNCTION format_time (
|
||||
COMMENT '
|
||||
Description
|
||||
-----------
|
||||
|
||||
|
||||
OBSOLETE. USE BUILT-IN format_pico_time() INSTEAD
|
||||
|
||||
Takes a raw picoseconds value, and converts it to a human readable form.
|
||||
|
||||
Picoseconds are the precision that all latency values are printed in
|
||||
|
@ -172,7 +172,7 @@ BEGIN
|
||||
GROUP_CONCAT(
|
||||
IFNULL(
|
||||
CONCAT('\n {\n',
|
||||
' "time": "', IFNULL(sys.format_time(trxi.timer_wait), ''), '",\n',
|
||||
' "time": "', IFNULL(format_pico_time(trxi.timer_wait), ''), '",\n',
|
||||
' "state": "', IFNULL(trxi.state, ''), '",\n',
|
||||
' "mode": "', IFNULL(trxi.access_mode, ''), '",\n',
|
||||
' "autocommitted": "', IFNULL(trxi.autocommit, ''), '",\n',
|
||||
@ -200,7 +200,7 @@ BEGIN
|
||||
IFNULL(
|
||||
CONCAT('\n {\n',
|
||||
' "sql_text": "', IFNULL(sys.format_statement(REPLACE(sql_text, '\\', '\\\\')), ''), '",\n',
|
||||
' "time": "', IFNULL(sys.format_time(timer_wait), ''), '",\n',
|
||||
' "time": "', IFNULL(format_pico_time(timer_wait), ''), '",\n',
|
||||
' "schema": "', IFNULL(current_schema, ''), '",\n',
|
||||
' "rows_examined": ', IFNULL(rows_examined, ''), ',\n',
|
||||
' "rows_affected": ', IFNULL(rows_affected, ''), ',\n',
|
||||
|
Reference in New Issue
Block a user