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:
@ -116,7 +116,7 @@ BEGIN
|
||||
SELECT CONCAT(IF(nesting_event_id IS NOT NULL, CONCAT(nesting_event_id, ' -> '), ''),
|
||||
event_id, '; ', event_id, ' [label="',
|
||||
-- Convert from picoseconds to microseconds
|
||||
'(', sys.format_time(timer_wait), ') ',
|
||||
'(', format_pico_time(timer_wait), ') ',
|
||||
IF (event_name NOT LIKE 'wait/io%',
|
||||
SUBSTRING_INDEX(event_name, '/', -2),
|
||||
IF (event_name NOT LIKE 'wait/io/file%' OR event_name NOT LIKE 'wait/io/socket%',
|
||||
@ -170,7 +170,7 @@ BEGIN
|
||||
CONCAT(sql_text, '\\n',
|
||||
'errors: ', errors, '\\n',
|
||||
'warnings: ', warnings, '\\n',
|
||||
'lock time: ', sys.format_time(lock_time),'\\n',
|
||||
'lock time: ', format_pico_time(lock_time),'\\n',
|
||||
'rows affected: ', rows_affected, '\\n',
|
||||
'rows sent: ', rows_sent, '\\n',
|
||||
'rows examined: ', rows_examined, '\\n',
|
||||
|
Reference in New Issue
Block a user