diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-03-27 18:50:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-03-27 21:27:27 +0200 |
| commit | c2b69163934016afa4bb3b274cddaacec92fcb61 (patch) | |
| tree | e626bb791fdfb7438e1bdd340da47970926c95b9 /mysql-test/suite | |
| parent | d9808f79de992964ed802d27984c9031d72e7b9a (diff) | |
| download | mariadb-git-c2b69163934016afa4bb3b274cddaacec92fcb61.tar.gz | |
MDEV-19629 post-merge fixesbb-11.0-serg
* 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
Diffstat (limited to 'mysql-test/suite')
35 files changed, 104 insertions, 437 deletions
diff --git a/mysql-test/suite/perfschema/r/pfs_functions.result b/mysql-test/suite/perfschema/r/pfs_functions.result deleted file mode 100644 index 322f64c1ce7..00000000000 --- a/mysql-test/suite/perfschema/r/pfs_functions.result +++ /dev/null @@ -1,213 +0,0 @@ -# MDEV-19629: Implement MySQL 8.0 native functions: format_bytes(), format_pico_time() and ps_thread_id() -# -# Tests for the Performance Schema native function format_pico_time() -# - -SELECT format_pico_time(NULL); -format_pico_time(NULL) -NULL - -SELECT format_pico_time(0); -format_pico_time(0) - 0 ps - -SELECT format_pico_time(1); -format_pico_time(1) - 1 ps - -SELECT format_pico_time(999); -format_pico_time(999) -999 ps - -SELECT format_pico_time(1000); -format_pico_time(1000) -1.00 ns - -SELECT format_pico_time(1001); -format_pico_time(1001) -1.00 ns - -SELECT format_pico_time(999999); -format_pico_time(999999) -1000.00 ns - -SELECT format_pico_time(1000000); -format_pico_time(1000000) -1.00 us - -SELECT format_pico_time(1000001); -format_pico_time(1000001) -1.00 us - -SELECT format_pico_time(1010000); -format_pico_time(1010000) -1.01 us - -SELECT format_pico_time(987654321); -format_pico_time(987654321) -987.65 us - -SELECT format_pico_time(1000000000); -format_pico_time(1000000000) -1.00 ms - -SELECT format_pico_time(999876000000); -format_pico_time(999876000000) -999.88 ms - -SELECT format_pico_time(999999999999); -format_pico_time(999999999999) -1000.00 ms - -SELECT format_pico_time(1000000000000); -format_pico_time(1000000000000) -1.00 s - -SELECT format_pico_time(59000000000000); -format_pico_time(59000000000000) -59.00 s - -SELECT format_pico_time(60000000000000); -format_pico_time(60000000000000) -1.00 min - -SELECT format_pico_time(3549000000000000); -format_pico_time(3549000000000000) -59.15 min - -SELECT format_pico_time(3599000000000000); -format_pico_time(3599000000000000) -59.98 min - -SELECT format_pico_time(3600000000000000); -format_pico_time(3600000000000000) -1.00 h - -SELECT format_pico_time(power(2, 63)); -format_pico_time(power(2, 63)) -106.75 d - -SELECT format_pico_time((power(2, 63) - 1) * 2 + 1); -format_pico_time((power(2, 63) - 1) * 2 + 1) -213.50 d - -SELECT format_pico_time(36000000.495523); -format_pico_time(36000000.495523) -36.00 us - -SELECT format_pico_time(1000 * pow(10,12) * 86400); -format_pico_time(1000 * pow(10,12) * 86400) -1000.00 d - -SELECT format_pico_time(86400000000000000000); -format_pico_time(86400000000000000000) -1000.00 d - -SELECT format_pico_time(86400000000000000000+5000); -format_pico_time(86400000000000000000+5000) -1000.00 d - -## Negative values are ok -SELECT format_pico_time(1010000 * -1); -format_pico_time(1010000 * -1) --1.01 us - -## Force exponent -SELECT format_pico_time(8650000000000000000099); -format_pico_time(8650000000000000000099) -1.00e+05 d - -SELECT format_pico_time(-8650000000000000000099); -format_pico_time(-8650000000000000000099) --1.00e+05 d - -SELECT format_pico_time(8640000000000000000099 * 2); -format_pico_time(8640000000000000000099 * 2) -2.00e+05 d - - -## Text input -SELECT format_pico_time("foo"); -format_pico_time("foo") - 0 ps -Warnings: -Warning 1292 Truncated incorrect DOUBLE value: 'foo' - -SELECT format_pico_time(""); -format_pico_time("") - 0 ps -Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '' - -SELECT format_pico_time("118059162071741143500099"); -format_pico_time("118059162071741143500099") -1.37e+06 d - -SELECT format_pico_time("-118059162071741143500099"); -format_pico_time("-118059162071741143500099") --1.37e+06 d - -## Recognizes up to first non-numeric -SELECT format_pico_time("40000 * 2000"); -format_pico_time("40000 * 2000") -40.00 ns -Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '40000 * 2000' - -SELECT format_pico_time("40000 foo 2000"); -format_pico_time("40000 foo 2000") -40.00 ns -Warnings: -Warning 1292 Truncated incorrect DOUBLE value: '40000 foo 2000' -## Aggregate functions -USE test; - -CREATE TABLE timer_waits (id VARCHAR(10), wait BIGINT UNSIGNED DEFAULT NULL) DEFAULT CHARSET = utf8mb4; - -INSERT INTO timer_waits VALUES ('1 sec', 1000000000000); -INSERT INTO timer_waits VALUES ('1 min', 60000000000000); -INSERT INTO timer_waits VALUES ('1 hour', 3600000000000000); -INSERT INTO timer_waits VALUES ('1 day', 86400000000000000); -INSERT INTO timer_waits VALUES ('100 days', 8640000000000000000); - -SELECT id, format_pico_time(wait), wait FROM timer_waits; -id format_pico_time(wait) wait -1 sec 1.00 s 1000000000000 -1 min 1.00 min 60000000000000 -1 hour 1.00 h 3600000000000000 -1 day 1.00 d 86400000000000000 -100 days 100.00 d 8640000000000000000 - -SELECT sum(wait), format_pico_time(sum(wait)) FROM timer_waits; -sum(wait) format_pico_time(sum(wait)) -8730061000000000000 101.04 d - -SELECT avg(wait), format_pico_time(avg(wait)) FROM timer_waits; -avg(wait) format_pico_time(avg(wait)) -1746012200000000000.0000 20.21 d - -SELECT min(wait), format_pico_time(min(wait)) FROM timer_waits; -min(wait) format_pico_time(min(wait)) -1000000000000 1.00 s - -SELECT max(wait), format_pico_time(max(wait)) FROM timer_waits; -max(wait) format_pico_time(max(wait)) -8640000000000000000 100.00 d - -DROP TABLE timer_waits; -## Using Scientific Notation -SELECT format_pico_time(3e9); -format_pico_time(3e9) -3.00 ms - -SELECT format_pico_time(4e6); -format_pico_time(4e6) -4.00 us - -SELECT format_pico_time(5e3); -format_pico_time(5e3) -5.00 ns - -SELECT format_pico_time(6e2); -format_pico_time(6e2) -600 ps diff --git a/mysql-test/suite/perfschema/t/pfs_functions.test b/mysql-test/suite/perfschema/t/pfs_functions.test deleted file mode 100644 index a175d3edeea..00000000000 --- a/mysql-test/suite/perfschema/t/pfs_functions.test +++ /dev/null @@ -1,120 +0,0 @@ -# Testcases for PFS functions are backported from MySQL - ---echo # MDEV-19629: Implement MySQL 8.0 native functions: format_bytes(), format_pico_time() and ps_thread_id() ---echo # ---echo # Tests for the Performance Schema native function format_pico_time() ---echo # ---echo - -SELECT format_pico_time(NULL); ---echo -SELECT format_pico_time(0); ---echo -SELECT format_pico_time(1); ---echo -SELECT format_pico_time(999); ---echo -SELECT format_pico_time(1000); ---echo -SELECT format_pico_time(1001); ---echo -SELECT format_pico_time(999999); ---echo -SELECT format_pico_time(1000000); ---echo -SELECT format_pico_time(1000001); ---echo -SELECT format_pico_time(1010000); ---echo -SELECT format_pico_time(987654321); ---echo -SELECT format_pico_time(1000000000); ---echo -SELECT format_pico_time(999876000000); ---echo -SELECT format_pico_time(999999999999); ---echo -SELECT format_pico_time(1000000000000); ---echo -SELECT format_pico_time(59000000000000); ---echo -SELECT format_pico_time(60000000000000); ---echo -SELECT format_pico_time(3549000000000000); ---echo -SELECT format_pico_time(3599000000000000); ---echo -SELECT format_pico_time(3600000000000000); ---echo -SELECT format_pico_time(power(2, 63)); ---echo -SELECT format_pico_time((power(2, 63) - 1) * 2 + 1); ---echo -SELECT format_pico_time(36000000.495523); ---echo -SELECT format_pico_time(1000 * pow(10,12) * 86400); ---echo -SELECT format_pico_time(86400000000000000000); ---echo -SELECT format_pico_time(86400000000000000000+5000); - ---echo ---echo ## Negative values are ok -SELECT format_pico_time(1010000 * -1); - ---echo ---echo ## Force exponent -SELECT format_pico_time(8650000000000000000099); ---echo -SELECT format_pico_time(-8650000000000000000099); ---echo -SELECT format_pico_time(8640000000000000000099 * 2); ---echo - ---echo ---echo ## Text input -SELECT format_pico_time("foo"); ---echo -SELECT format_pico_time(""); ---echo -SELECT format_pico_time("118059162071741143500099"); ---echo -SELECT format_pico_time("-118059162071741143500099"); ---echo ---echo ## Recognizes up to first non-numeric -SELECT format_pico_time("40000 * 2000"); ---echo -SELECT format_pico_time("40000 foo 2000"); - ---echo ## Aggregate functions -USE test; ---echo -CREATE TABLE timer_waits (id VARCHAR(10), wait BIGINT UNSIGNED DEFAULT NULL) DEFAULT CHARSET = utf8mb4; ---echo -# Max BIGINT unsigned is 18 446 744 073 709 551 615 -INSERT INTO timer_waits VALUES ('1 sec', 1000000000000); -INSERT INTO timer_waits VALUES ('1 min', 60000000000000); -INSERT INTO timer_waits VALUES ('1 hour', 3600000000000000); -INSERT INTO timer_waits VALUES ('1 day', 86400000000000000); -INSERT INTO timer_waits VALUES ('100 days', 8640000000000000000); ---echo -SELECT id, format_pico_time(wait), wait FROM timer_waits; ---echo -SELECT sum(wait), format_pico_time(sum(wait)) FROM timer_waits; ---echo -SELECT avg(wait), format_pico_time(avg(wait)) FROM timer_waits; ---echo -SELECT min(wait), format_pico_time(min(wait)) FROM timer_waits; ---echo -SELECT max(wait), format_pico_time(max(wait)) FROM timer_waits; ---echo -DROP TABLE timer_waits; - ---echo ## Using Scientific Notation -SELECT format_pico_time(3e9); ---echo -SELECT format_pico_time(4e6); ---echo -SELECT format_pico_time(5e3); ---echo -SELECT format_pico_time(6e2); diff --git a/mysql-test/suite/sysschema/r/v_host_summary.result b/mysql-test/suite/sysschema/r/v_host_summary.result index b619a8a55fd..6eef4a41532 100644 --- a/mysql-test/suite/sysschema/r/v_host_summary.result +++ b/mysql-test/suite/sysschema/r/v_host_summary.result @@ -2,11 +2,11 @@ DESC sys.host_summary; Field Type Null Key Default Extra host varchar(255) YES NULL statements decimal(64,0) YES NULL -statement_latency text YES NULL -statement_avg_latency text YES NULL +statement_latency varchar(12) YES NULL +statement_avg_latency varchar(12) YES NULL table_scans decimal(65,0) YES NULL file_ios decimal(64,0) YES NULL -file_io_latency text YES NULL +file_io_latency varchar(12) YES NULL current_connections decimal(41,0) YES NULL total_connections decimal(41,0) YES NULL unique_users bigint(21) NO 0 diff --git a/mysql-test/suite/sysschema/r/v_host_summary_by_file_io.result b/mysql-test/suite/sysschema/r/v_host_summary_by_file_io.result index 8e257163da7..979d4a719d1 100644 --- a/mysql-test/suite/sysschema/r/v_host_summary_by_file_io.result +++ b/mysql-test/suite/sysschema/r/v_host_summary_by_file_io.result @@ -2,7 +2,7 @@ DESC sys.host_summary_by_file_io; Field Type Null Key Default Extra host varchar(255) YES NULL ios decimal(42,0) YES NULL -io_latency text YES NULL +io_latency varchar(12) YES NULL SELECT * FROM sys.host_summary_by_file_io; DESC sys.x$host_summary_by_file_io; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_host_summary_by_file_io_type.result b/mysql-test/suite/sysschema/r/v_host_summary_by_file_io_type.result index c9a56aa9943..9844b8b7c03 100644 --- a/mysql-test/suite/sysschema/r/v_host_summary_by_file_io_type.result +++ b/mysql-test/suite/sysschema/r/v_host_summary_by_file_io_type.result @@ -3,8 +3,8 @@ Field Type Null Key Default Extra host varchar(255) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL SELECT * FROM sys.host_summary_by_file_io_type; DESC sys.x$host_summary_by_file_io_type; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_host_summary_by_stages.result b/mysql-test/suite/sysschema/r/v_host_summary_by_stages.result index 0ee6f25562c..3910ed6e1a6 100644 --- a/mysql-test/suite/sysschema/r/v_host_summary_by_stages.result +++ b/mysql-test/suite/sysschema/r/v_host_summary_by_stages.result @@ -3,8 +3,8 @@ Field Type Null Key Default Extra host varchar(255) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -avg_latency text YES NULL +total_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL SELECT * FROM sys.host_summary_by_stages; DESC sys.x$host_summary_by_stages; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_host_summary_by_statement_latency.result b/mysql-test/suite/sysschema/r/v_host_summary_by_statement_latency.result index 882a30b71a1..e7f906e615c 100644 --- a/mysql-test/suite/sysschema/r/v_host_summary_by_statement_latency.result +++ b/mysql-test/suite/sysschema/r/v_host_summary_by_statement_latency.result @@ -2,9 +2,9 @@ DESC sys.host_summary_by_statement_latency; Field Type Null Key Default Extra host varchar(255) YES NULL total decimal(42,0) YES NULL -total_latency text YES NULL -max_latency text YES NULL -lock_latency text YES NULL +total_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL +lock_latency varchar(12) YES NULL rows_sent decimal(42,0) YES NULL rows_examined decimal(42,0) YES NULL rows_affected decimal(42,0) YES NULL diff --git a/mysql-test/suite/sysschema/r/v_host_summary_by_statement_type.result b/mysql-test/suite/sysschema/r/v_host_summary_by_statement_type.result index eec8f8695c6..14e58d7d135 100644 --- a/mysql-test/suite/sysschema/r/v_host_summary_by_statement_type.result +++ b/mysql-test/suite/sysschema/r/v_host_summary_by_statement_type.result @@ -3,9 +3,9 @@ Field Type Null Key Default Extra host varchar(255) YES NULL statement varchar(128) YES NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -max_latency text YES NULL -lock_latency text YES NULL +total_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL +lock_latency varchar(12) YES NULL rows_sent bigint(20) unsigned NO NULL rows_examined bigint(20) unsigned NO NULL rows_affected bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result b/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result index fddd2f266df..bed684ae7c8 100644 --- a/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result @@ -2,10 +2,10 @@ DESC sys.io_by_thread_by_latency; Field Type Null Key Default Extra user varchar(384) YES NULL total decimal(42,0) YES NULL -total_latency text YES NULL -min_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +min_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL thread_id bigint(20) unsigned NO NULL processlist_id bigint(20) unsigned YES NULL SELECT * FROM sys.io_by_thread_by_latency; diff --git a/mysql-test/suite/sysschema/r/v_io_global_by_file_by_latency.result b/mysql-test/suite/sysschema/r/v_io_global_by_file_by_latency.result index 32d992c2751..c56d02f641f 100644 --- a/mysql-test/suite/sysschema/r/v_io_global_by_file_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_io_global_by_file_by_latency.result @@ -2,13 +2,13 @@ DESC sys.io_global_by_file_by_latency; Field Type Null Key Default Extra file varchar(512) YES NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL +total_latency varchar(12) YES NULL count_read bigint(20) unsigned NO NULL -read_latency text YES NULL +read_latency varchar(12) YES NULL count_write bigint(20) unsigned NO NULL -write_latency text YES NULL +write_latency varchar(12) YES NULL count_misc bigint(20) unsigned NO NULL -misc_latency text YES NULL +misc_latency varchar(12) YES NULL SELECT * FROM sys.io_global_by_file_by_latency; DESC sys.x$io_global_by_file_by_latency; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_bytes.result b/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_bytes.result index 3d5dcbffbf6..d47dc9df085 100644 --- a/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_bytes.result +++ b/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_bytes.result @@ -2,10 +2,10 @@ DESC sys.io_global_by_wait_by_bytes; Field Type Null Key Default Extra event_name varchar(128) YES NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -min_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +min_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL count_read bigint(20) unsigned NO NULL total_read text YES NULL avg_read text YES NULL diff --git a/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_latency.result b/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_latency.result index 1c5db297964..62399c7953d 100644 --- a/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_io_global_by_wait_by_latency.result @@ -2,12 +2,12 @@ DESC sys.io_global_by_wait_by_latency; Field Type Null Key Default Extra event_name varchar(128) YES NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL -read_latency text YES NULL -write_latency text YES NULL -misc_latency text YES NULL +total_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL +read_latency varchar(12) YES NULL +write_latency varchar(12) YES NULL +misc_latency varchar(12) YES NULL count_read bigint(20) unsigned NO NULL total_read text YES NULL avg_read text YES NULL diff --git a/mysql-test/suite/sysschema/r/v_latest_file_io.result b/mysql-test/suite/sysschema/r/v_latest_file_io.result index a65cdb2dd10..8bdc02145f6 100644 --- a/mysql-test/suite/sysschema/r/v_latest_file_io.result +++ b/mysql-test/suite/sysschema/r/v_latest_file_io.result @@ -2,7 +2,7 @@ DESC sys.latest_file_io; Field Type Null Key Default Extra thread varchar(214) YES NULL file varchar(512) YES NULL -latency text YES NULL +latency varchar(12) YES NULL operation varchar(32) NO NULL requested text YES NULL SELECT * FROM sys.latest_file_io; diff --git a/mysql-test/suite/sysschema/r/v_processlist.result b/mysql-test/suite/sysschema/r/v_processlist.result index dfc048143d6..f242497907f 100644 --- a/mysql-test/suite/sysschema/r/v_processlist.result +++ b/mysql-test/suite/sysschema/r/v_processlist.result @@ -8,9 +8,9 @@ command varchar(16) YES NULL state varchar(64) YES NULL time bigint(20) YES NULL current_statement longtext YES NULL -statement_latency mediumtext YES NULL +statement_latency varchar(12) YES NULL progress decimal(26,2) YES NULL -lock_latency text YES NULL +lock_latency varchar(12) YES NULL rows_examined bigint(20) unsigned YES NULL rows_sent bigint(20) unsigned YES NULL rows_affected bigint(20) unsigned YES NULL @@ -18,12 +18,12 @@ tmp_tables bigint(20) unsigned YES NULL tmp_disk_tables bigint(20) unsigned YES NULL full_scan varchar(3) YES NULL last_statement longtext YES NULL -last_statement_latency mediumtext YES NULL +last_statement_latency varchar(12) YES NULL current_memory text YES NULL last_wait varchar(128) YES NULL -last_wait_latency mediumtext YES NULL +last_wait_latency varchar(13) YES NULL source varchar(64) YES NULL -trx_latency text YES NULL +trx_latency varchar(12) YES NULL trx_state enum('ACTIVE','COMMITTED','ROLLED BACK') YES NULL trx_autocommit enum('YES','NO') YES NULL pid varchar(1024) YES NULL diff --git a/mysql-test/suite/sysschema/r/v_schema_index_statistics.result b/mysql-test/suite/sysschema/r/v_schema_index_statistics.result index 63cf1931e79..959f8628145 100644 --- a/mysql-test/suite/sysschema/r/v_schema_index_statistics.result +++ b/mysql-test/suite/sysschema/r/v_schema_index_statistics.result @@ -4,13 +4,13 @@ table_schema varchar(64) YES NULL table_name varchar(64) YES NULL index_name varchar(64) YES NULL rows_selected bigint(20) unsigned NO NULL -select_latency text YES NULL +select_latency varchar(12) YES NULL rows_inserted bigint(20) unsigned NO NULL -insert_latency text YES NULL +insert_latency varchar(12) YES NULL rows_updated bigint(20) unsigned NO NULL -update_latency text YES NULL +update_latency varchar(12) YES NULL rows_deleted bigint(20) unsigned NO NULL -delete_latency text YES NULL +delete_latency varchar(12) YES NULL SELECT * FROM sys.schema_index_statistics; DESC sys.x$schema_index_statistics; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_schema_table_statistics.result b/mysql-test/suite/sysschema/r/v_schema_table_statistics.result index fda0d7da310..0ca9096d937 100644 --- a/mysql-test/suite/sysschema/r/v_schema_table_statistics.result +++ b/mysql-test/suite/sysschema/r/v_schema_table_statistics.result @@ -2,23 +2,23 @@ DESC sys.schema_table_statistics; Field Type Null Key Default Extra table_schema varchar(64) YES NULL table_name varchar(64) YES NULL -total_latency text YES NULL +total_latency varchar(12) YES NULL rows_fetched bigint(20) unsigned NO NULL -fetch_latency text YES NULL +fetch_latency varchar(12) YES NULL rows_inserted bigint(20) unsigned NO NULL -insert_latency text YES NULL +insert_latency varchar(12) YES NULL rows_updated bigint(20) unsigned NO NULL -update_latency text YES NULL +update_latency varchar(12) YES NULL rows_deleted bigint(20) unsigned NO NULL -delete_latency text YES NULL +delete_latency varchar(12) YES NULL io_read_requests decimal(42,0) YES NULL io_read text YES NULL -io_read_latency text YES NULL +io_read_latency varchar(12) YES NULL io_write_requests decimal(42,0) YES NULL io_write text YES NULL -io_write_latency text YES NULL +io_write_latency varchar(12) YES NULL io_misc_requests decimal(42,0) YES NULL -io_misc_latency text YES NULL +io_misc_latency varchar(12) YES NULL SELECT * FROM sys.schema_table_statistics; DESC sys.x$schema_table_statistics; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_schema_table_statistics_with_buffer.result b/mysql-test/suite/sysschema/r/v_schema_table_statistics_with_buffer.result index 809e8a4e823..28f5ee84f98 100644 --- a/mysql-test/suite/sysschema/r/v_schema_table_statistics_with_buffer.result +++ b/mysql-test/suite/sysschema/r/v_schema_table_statistics_with_buffer.result @@ -3,21 +3,21 @@ Field Type Null Key Default Extra table_schema varchar(64) YES NULL table_name varchar(64) YES NULL rows_fetched bigint(20) unsigned NO NULL -fetch_latency text YES NULL +fetch_latency varchar(12) YES NULL rows_inserted bigint(20) unsigned NO NULL -insert_latency text YES NULL +insert_latency varchar(12) YES NULL rows_updated bigint(20) unsigned NO NULL -update_latency text YES NULL +update_latency varchar(12) YES NULL rows_deleted bigint(20) unsigned NO NULL -delete_latency text YES NULL +delete_latency varchar(12) YES NULL io_read_requests decimal(42,0) YES NULL io_read text YES NULL -io_read_latency text YES NULL +io_read_latency varchar(12) YES NULL io_write_requests decimal(42,0) YES NULL io_write text YES NULL -io_write_latency text YES NULL +io_write_latency varchar(12) YES NULL io_misc_requests decimal(42,0) YES NULL -io_misc_latency text YES NULL +io_misc_latency varchar(12) YES NULL innodb_buffer_allocated text YES NULL innodb_buffer_data text YES NULL innodb_buffer_free text YES NULL diff --git a/mysql-test/suite/sysschema/r/v_schema_tables_with_full_table_scans.result b/mysql-test/suite/sysschema/r/v_schema_tables_with_full_table_scans.result index a6aca341f2e..9516071ca9b 100644 --- a/mysql-test/suite/sysschema/r/v_schema_tables_with_full_table_scans.result +++ b/mysql-test/suite/sysschema/r/v_schema_tables_with_full_table_scans.result @@ -3,7 +3,7 @@ Field Type Null Key Default Extra object_schema varchar(64) YES NULL object_name varchar(64) YES NULL rows_full_scanned bigint(20) unsigned NO NULL -latency text YES NULL +latency varchar(12) YES NULL SELECT * FROM sys.schema_tables_with_full_table_scans; DESC sys.x$schema_tables_with_full_table_scans; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_session.result b/mysql-test/suite/sysschema/r/v_session.result index fd88b8f1d6a..21e237ed3f6 100644 --- a/mysql-test/suite/sysschema/r/v_session.result +++ b/mysql-test/suite/sysschema/r/v_session.result @@ -8,9 +8,9 @@ command varchar(16) YES NULL state varchar(64) YES NULL time bigint(20) YES NULL current_statement longtext YES NULL -statement_latency mediumtext YES NULL +statement_latency varchar(12) YES NULL progress decimal(26,2) YES NULL -lock_latency text YES NULL +lock_latency varchar(12) YES NULL rows_examined bigint(20) unsigned YES NULL rows_sent bigint(20) unsigned YES NULL rows_affected bigint(20) unsigned YES NULL @@ -18,12 +18,12 @@ tmp_tables bigint(20) unsigned YES NULL tmp_disk_tables bigint(20) unsigned YES NULL full_scan varchar(3) YES NULL last_statement longtext YES NULL -last_statement_latency mediumtext YES NULL +last_statement_latency varchar(12) YES NULL current_memory text YES NULL last_wait varchar(128) YES NULL -last_wait_latency mediumtext YES NULL +last_wait_latency varchar(13) YES NULL source varchar(64) YES NULL -trx_latency text YES NULL +trx_latency varchar(12) YES NULL trx_state enum('ACTIVE','COMMITTED','ROLLED BACK') YES NULL trx_autocommit enum('YES','NO') YES NULL pid varchar(1024) YES NULL diff --git a/mysql-test/suite/sysschema/r/v_statement_analysis.result b/mysql-test/suite/sysschema/r/v_statement_analysis.result index c3dd167c9fa..510e17d6d7a 100644 --- a/mysql-test/suite/sysschema/r/v_statement_analysis.result +++ b/mysql-test/suite/sysschema/r/v_statement_analysis.result @@ -6,10 +6,10 @@ full_scan varchar(1) NO exec_count bigint(20) unsigned NO NULL err_count bigint(20) unsigned NO NULL warn_count bigint(20) unsigned NO NULL -total_latency text YES NULL -max_latency text YES NULL -avg_latency text YES NULL -lock_latency text YES NULL +total_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +lock_latency varchar(12) YES NULL rows_sent bigint(20) unsigned NO NULL rows_sent_avg decimal(21,0) NO 0 rows_examined bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result b/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result index a762cfd7d3e..f543c8adfcc 100644 --- a/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result +++ b/mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result @@ -3,7 +3,7 @@ Field Type Null Key Default Extra query longtext YES NULL db varchar(64) YES NULL exec_count bigint(20) unsigned NO NULL -total_latency text YES NULL +total_latency varchar(12) YES NULL no_index_used_count bigint(20) unsigned NO NULL no_good_index_used_count bigint(20) unsigned NO NULL no_index_used_pct decimal(24,0) NO 0 diff --git a/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result b/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result index 5cc05f276f8..90ea51a424b 100644 --- a/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result +++ b/mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result @@ -6,9 +6,9 @@ full_scan varchar(1) NO exec_count bigint(20) unsigned NO NULL err_count bigint(20) unsigned NO NULL warn_count bigint(20) unsigned NO NULL -total_latency text YES NULL -max_latency text YES NULL -avg_latency text YES NULL +total_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL rows_sent bigint(20) unsigned NO NULL rows_sent_avg decimal(21,0) NO 0 rows_examined bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_statements_with_sorting.result b/mysql-test/suite/sysschema/r/v_statements_with_sorting.result index 034987b8e72..b3a715731a4 100644 --- a/mysql-test/suite/sysschema/r/v_statements_with_sorting.result +++ b/mysql-test/suite/sysschema/r/v_statements_with_sorting.result @@ -3,7 +3,7 @@ Field Type Null Key Default Extra query longtext YES NULL db varchar(64) YES NULL exec_count bigint(20) unsigned NO NULL -total_latency text YES NULL +total_latency varchar(12) YES NULL sort_merge_passes bigint(20) unsigned NO NULL avg_sort_merges decimal(21,0) NO 0 sorts_using_scans bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result b/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result index 52683a561b2..73ea1ae00c2 100644 --- a/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result +++ b/mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result @@ -3,7 +3,7 @@ Field Type Null Key Default Extra query longtext YES NULL db varchar(64) YES NULL exec_count bigint(20) unsigned NO NULL -total_latency text YES NULL +total_latency varchar(12) YES NULL memory_tmp_tables bigint(20) unsigned NO NULL disk_tmp_tables bigint(20) unsigned NO NULL avg_tmp_tables_per_query decimal(21,0) NO 0 diff --git a/mysql-test/suite/sysschema/r/v_user_summary.result b/mysql-test/suite/sysschema/r/v_user_summary.result index 233fcccc5c8..9caa02008f8 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary.result +++ b/mysql-test/suite/sysschema/r/v_user_summary.result @@ -2,11 +2,11 @@ DESC sys.user_summary; Field Type Null Key Default Extra user varchar(128) YES NULL statements decimal(64,0) YES NULL -statement_latency text YES NULL -statement_avg_latency text YES NULL +statement_latency varchar(12) YES NULL +statement_avg_latency varchar(12) YES NULL table_scans decimal(65,0) YES NULL file_ios decimal(64,0) YES NULL -file_io_latency text YES NULL +file_io_latency varchar(12) YES NULL current_connections decimal(41,0) YES NULL total_connections decimal(41,0) YES NULL unique_hosts bigint(21) NO 0 diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result index f6f106a5015..d4429b8e66c 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result @@ -2,7 +2,7 @@ DESC sys.user_summary_by_file_io; Field Type Null Key Default Extra user varchar(128) YES NULL ios decimal(42,0) YES NULL -io_latency text YES NULL +io_latency varchar(12) YES NULL SELECT * FROM sys.user_summary_by_file_io; DESC sys.x$user_summary_by_file_io; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result index c143697c068..cff57e77adb 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result @@ -3,8 +3,8 @@ Field Type Null Key Default Extra user varchar(128) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL -latency text YES NULL -max_latency text YES NULL +latency varchar(12) YES NULL +max_latency varchar(12) YES NULL SELECT * FROM sys.user_summary_by_file_io_type; DESC sys.x$user_summary_by_file_io_type; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result b/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result index 9b90fe9cf47..655660a25aa 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_stages.result @@ -3,8 +3,8 @@ Field Type Null Key Default Extra user varchar(128) YES NULL event_name varchar(128) NO NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -avg_latency text YES NULL +total_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL SELECT * FROM sys.user_summary_by_stages; DESC sys.x$user_summary_by_stages; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result index 36dadc2925b..b5a7fcc2737 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_latency.result @@ -2,9 +2,9 @@ DESC sys.user_summary_by_statement_latency; Field Type Null Key Default Extra user varchar(128) YES NULL total decimal(42,0) YES NULL -total_latency text YES NULL -max_latency text YES NULL -lock_latency text YES NULL +total_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL +lock_latency varchar(12) YES NULL rows_sent decimal(42,0) YES NULL rows_examined decimal(42,0) YES NULL rows_affected decimal(42,0) YES NULL diff --git a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result index bd006c871b9..70a7ea3f9f5 100644 --- a/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result +++ b/mysql-test/suite/sysschema/r/v_user_summary_by_statement_type.result @@ -3,9 +3,9 @@ Field Type Null Key Default Extra user varchar(128) YES NULL statement varchar(128) YES NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -max_latency text YES NULL -lock_latency text YES NULL +total_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL +lock_latency varchar(12) YES NULL rows_sent bigint(20) unsigned NO NULL rows_examined bigint(20) unsigned NO NULL rows_affected bigint(20) unsigned NO NULL diff --git a/mysql-test/suite/sysschema/r/v_wait_classes_global_by_avg_latency.result b/mysql-test/suite/sysschema/r/v_wait_classes_global_by_avg_latency.result index f6559cb7dd7..52d506ea575 100644 --- a/mysql-test/suite/sysschema/r/v_wait_classes_global_by_avg_latency.result +++ b/mysql-test/suite/sysschema/r/v_wait_classes_global_by_avg_latency.result @@ -2,10 +2,10 @@ DESC sys.wait_classes_global_by_avg_latency; Field Type Null Key Default Extra event_class varchar(128) YES NULL total decimal(42,0) YES NULL -total_latency text YES NULL -min_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +min_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL SELECT * FROM sys.wait_classes_global_by_avg_latency; DESC sys.x$wait_classes_global_by_avg_latency; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_wait_classes_global_by_latency.result b/mysql-test/suite/sysschema/r/v_wait_classes_global_by_latency.result index 10db5ead78b..95f619619eb 100644 --- a/mysql-test/suite/sysschema/r/v_wait_classes_global_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_wait_classes_global_by_latency.result @@ -2,10 +2,10 @@ DESC sys.wait_classes_global_by_latency; Field Type Null Key Default Extra event_class varchar(128) YES NULL total decimal(42,0) YES NULL -total_latency text YES NULL -min_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +min_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL SELECT * FROM sys.wait_classes_global_by_latency; DESC sys.x$wait_classes_global_by_latency; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_waits_by_host_by_latency.result b/mysql-test/suite/sysschema/r/v_waits_by_host_by_latency.result index 5e595d9cf85..cbbed779a59 100644 --- a/mysql-test/suite/sysschema/r/v_waits_by_host_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_waits_by_host_by_latency.result @@ -3,9 +3,9 @@ Field Type Null Key Default Extra host varchar(255) YES NULL event varchar(128) NO NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL SELECT * FROM sys.waits_by_host_by_latency; DESC sys.x$waits_by_host_by_latency; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result b/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result index 860db68cc50..369b3a18423 100644 --- a/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_waits_by_user_by_latency.result @@ -3,9 +3,9 @@ Field Type Null Key Default Extra user varchar(128) YES NULL event varchar(128) NO NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL SELECT * FROM sys.waits_by_user_by_latency; DESC sys.x$waits_by_user_by_latency; Field Type Null Key Default Extra diff --git a/mysql-test/suite/sysschema/r/v_waits_global_by_latency.result b/mysql-test/suite/sysschema/r/v_waits_global_by_latency.result index 1e32a9b8ff0..0fafb72389e 100644 --- a/mysql-test/suite/sysschema/r/v_waits_global_by_latency.result +++ b/mysql-test/suite/sysschema/r/v_waits_global_by_latency.result @@ -2,9 +2,9 @@ DESC sys.waits_global_by_latency; Field Type Null Key Default Extra events varchar(128) NO NULL total bigint(20) unsigned NO NULL -total_latency text YES NULL -avg_latency text YES NULL -max_latency text YES NULL +total_latency varchar(12) YES NULL +avg_latency varchar(12) YES NULL +max_latency varchar(12) YES NULL SELECT * FROM sys.waits_global_by_latency; DESC sys.x$waits_global_by_latency; Field Type Null Key Default Extra |