Skip to content

Commit c2b6916

Browse files
committed
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
1 parent d9808f7 commit c2b6916

File tree

86 files changed

+347
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+347
-430
lines changed

libmysqld/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
6464
../sql/item.cc ../sql/item_create.cc ../sql/item_func.cc
6565
../sql/item_geofunc.cc ../sql/item_row.cc ../sql/item_strfunc.cc
6666
../sql/item_subselect.cc ../sql/item_sum.cc ../sql/item_timefunc.cc
67-
../sql/item_xmlfunc.cc ../sql/item_jsonfunc.cc ../sql/item_pfsfunc.cc
67+
../sql/item_xmlfunc.cc ../sql/item_jsonfunc.cc
6868
../sql/key.cc ../sql/lock.cc ../sql/log.cc
6969
../sql/log_event.cc ../sql/log_event_server.cc
7070
../sql/mf_iocache.cc ../sql/my_decimal.cc

mysql-test/suite/sysschema/r/v_host_summary.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ DESC sys.host_summary;
22
Field Type Null Key Default Extra
33
host varchar(255) YES NULL
44
statements decimal(64,0) YES NULL
5-
statement_latency text YES NULL
6-
statement_avg_latency text YES NULL
5+
statement_latency varchar(12) YES NULL
6+
statement_avg_latency varchar(12) YES NULL
77
table_scans decimal(65,0) YES NULL
88
file_ios decimal(64,0) YES NULL
9-
file_io_latency text YES NULL
9+
file_io_latency varchar(12) YES NULL
1010
current_connections decimal(41,0) YES NULL
1111
total_connections decimal(41,0) YES NULL
1212
unique_users bigint(21) NO 0

mysql-test/suite/sysschema/r/v_host_summary_by_file_io.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ DESC sys.host_summary_by_file_io;
22
Field Type Null Key Default Extra
33
host varchar(255) YES NULL
44
ios decimal(42,0) YES NULL
5-
io_latency text YES NULL
5+
io_latency varchar(12) YES NULL
66
SELECT * FROM sys.host_summary_by_file_io;
77
DESC sys.x$host_summary_by_file_io;
88
Field Type Null Key Default Extra

mysql-test/suite/sysschema/r/v_host_summary_by_file_io_type.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Field Type Null Key Default Extra
33
host varchar(255) YES NULL
44
event_name varchar(128) NO NULL
55
total bigint(20) unsigned NO NULL
6-
total_latency text YES NULL
7-
max_latency text YES NULL
6+
total_latency varchar(12) YES NULL
7+
max_latency varchar(12) YES NULL
88
SELECT * FROM sys.host_summary_by_file_io_type;
99
DESC sys.x$host_summary_by_file_io_type;
1010
Field Type Null Key Default Extra

mysql-test/suite/sysschema/r/v_host_summary_by_stages.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Field Type Null Key Default Extra
33
host varchar(255) YES NULL
44
event_name varchar(128) NO NULL
55
total bigint(20) unsigned NO NULL
6-
total_latency text YES NULL
7-
avg_latency text YES NULL
6+
total_latency varchar(12) YES NULL
7+
avg_latency varchar(12) YES NULL
88
SELECT * FROM sys.host_summary_by_stages;
99
DESC sys.x$host_summary_by_stages;
1010
Field Type Null Key Default Extra

mysql-test/suite/sysschema/r/v_host_summary_by_statement_latency.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ DESC sys.host_summary_by_statement_latency;
22
Field Type Null Key Default Extra
33
host varchar(255) YES NULL
44
total decimal(42,0) YES NULL
5-
total_latency text YES NULL
6-
max_latency text YES NULL
7-
lock_latency text YES NULL
5+
total_latency varchar(12) YES NULL
6+
max_latency varchar(12) YES NULL
7+
lock_latency varchar(12) YES NULL
88
rows_sent decimal(42,0) YES NULL
99
rows_examined decimal(42,0) YES NULL
1010
rows_affected decimal(42,0) YES NULL

mysql-test/suite/sysschema/r/v_host_summary_by_statement_type.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Field Type Null Key Default Extra
33
host varchar(255) YES NULL
44
statement varchar(128) YES NULL
55
total bigint(20) unsigned NO NULL
6-
total_latency text YES NULL
7-
max_latency text YES NULL
8-
lock_latency text YES NULL
6+
total_latency varchar(12) YES NULL
7+
max_latency varchar(12) YES NULL
8+
lock_latency varchar(12) YES NULL
99
rows_sent bigint(20) unsigned NO NULL
1010
rows_examined bigint(20) unsigned NO NULL
1111
rows_affected bigint(20) unsigned NO NULL

mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ DESC sys.io_by_thread_by_latency;
22
Field Type Null Key Default Extra
33
user varchar(384) YES NULL
44
total decimal(42,0) YES NULL
5-
total_latency text YES NULL
6-
min_latency text YES NULL
7-
avg_latency text YES NULL
8-
max_latency text YES NULL
5+
total_latency varchar(12) YES NULL
6+
min_latency varchar(12) YES NULL
7+
avg_latency varchar(12) YES NULL
8+
max_latency varchar(12) YES NULL
99
thread_id bigint(20) unsigned NO NULL
1010
processlist_id bigint(20) unsigned YES NULL
1111
SELECT * FROM sys.io_by_thread_by_latency;

0 commit comments

Comments
 (0)