diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result index 0e659bdd1191c2db54f7458103d36a3edda36335..bb60ea984cf27b9bb2f618d631729c4a9d44597e 100644 --- a/mysql-test/suite/funcs_1/r/innodb_func_view.result +++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result @@ -3774,7 +3774,7 @@ CAST(my_varbinary_1000 AS TIME) my_varbinary_1000 id NULL NULL 1 NULL 2 00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 23 Warnings: @@ -3812,7 +3812,7 @@ CAST(my_binary_30 AS TIME) my_binary_30 id NULL NULL 1 00:00:00 2 00:00:00 <--------30 characters-------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 NULL -1 5 41:58:00 1 17:58 22 Warnings: @@ -3850,7 +3850,7 @@ CAST(my_varchar_1000 AS TIME) my_varchar_1000 id NULL NULL 1 NULL 2 00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 21 Warnings: @@ -3886,7 +3886,7 @@ CAST(my_char_30 AS TIME) my_char_30 id NULL NULL 1 NULL 2 00:00:00 <--------30 characters-------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 20 Warnings: diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result index 95edbdb9f1d9daf11fb8aa5d62fce01e0ea375d2..ccf03a125fa080589479c2ae0c0cc82cd5ca3f0a 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result @@ -74,7 +74,7 @@ def mysql general_log thread_id 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL b def mysql general_log user_host 2 NULL NO mediumtext 16777215 16777215 NULL NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references def mysql gtid_executed interval_end 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references Last number of interval. def mysql gtid_executed interval_start 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) PRI select,insert,update,references First number of interval. -def mysql gtid_executed source_uuid 1 NULL NO char 36 36 NULL NULL NULL latin1 latin1_swedish_ci char(36) PRI select,insert,update,references uuid of the source where the transaction was originally executed. +def mysql gtid_executed source_uuid 1 NULL NO char 36 144 NULL NULL NULL utf8mb4 utf8mb4_general_ci char(36) PRI select,insert,update,references uuid of the source where the transaction was originally executed. def mysql help_category help_category_id 1 NULL NO smallint NULL NULL 5 0 NULL NULL NULL smallint(5) unsigned PRI select,insert,update,references def mysql help_category name 2 NULL NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) UNI select,insert,update,references def mysql help_category parent_category_id 3 NULL YES smallint NULL NULL 5 0 NULL NULL NULL smallint(5) unsigned select,insert,update,references @@ -105,10 +105,10 @@ def mysql innodb_table_stats sum_of_other_index_sizes 6 NULL NO bigint NULL NULL def mysql innodb_table_stats table_name 2 NULL NO varchar 199 597 NULL NULL NULL utf8 utf8_bin varchar(199) PRI select,insert,update,references def mysql ndb_binlog_index deletes 6 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references def mysql ndb_binlog_index epoch 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned PRI select,insert,update,references -def mysql ndb_binlog_index File 2 NULL NO varchar 255 255 NULL NULL NULL latin1 latin1_swedish_ci varchar(255) select,insert,update,references +def mysql ndb_binlog_index File 2 NULL NO varchar 255 1020 NULL NULL NULL utf8mb4 utf8mb4_general_ci varchar(255) select,insert,update,references def mysql ndb_binlog_index gci 10 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references def mysql ndb_binlog_index inserts 4 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references -def mysql ndb_binlog_index next_file 12 NULL NO varchar 255 255 NULL NULL NULL latin1 latin1_swedish_ci varchar(255) select,insert,update,references +def mysql ndb_binlog_index next_file 12 NULL NO varchar 255 1020 NULL NULL NULL utf8mb4 utf8mb4_general_ci varchar(255) select,insert,update,references def mysql ndb_binlog_index next_position 11 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references def mysql ndb_binlog_index orig_epoch 9 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned PRI select,insert,update,references def mysql ndb_binlog_index orig_server_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI select,insert,update,references @@ -308,7 +308,6 @@ COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME 1.0000 longblob NULL NULL 1.0000 mediumblob NULL NULL 1.0000 char latin1 latin1_swedish_ci -1.0000 varchar latin1 latin1_swedish_ci 1.0000 text utf8 utf8_bin 1.0000 mediumtext utf8 utf8_general_ci 1.0000 text utf8 utf8_general_ci @@ -329,6 +328,8 @@ COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME 3.0000 enum utf8 utf8_general_ci 3.0000 set utf8 utf8_general_ci 3.0000 varchar utf8 utf8_general_ci +4.0000 char utf8mb4 utf8mb4_general_ci +4.0000 varchar utf8mb4 utf8mb4_general_ci SELECT DISTINCT CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML, DATA_TYPE, @@ -430,7 +431,7 @@ NULL mysql general_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned NULL mysql general_log server_id int NULL NULL NULL NULL int(10) unsigned 3.0000 mysql general_log command_type varchar 64 192 utf8 utf8_general_ci varchar(64) 1.0000 mysql general_log argument mediumblob 16777215 16777215 NULL NULL mediumblob -1.0000 mysql gtid_executed source_uuid char 36 36 latin1 latin1_swedish_ci char(36) +4.0000 mysql gtid_executed source_uuid char 36 144 utf8mb4 utf8mb4_general_ci char(36) NULL mysql gtid_executed interval_start bigint NULL NULL NULL NULL bigint(20) NULL mysql gtid_executed interval_end bigint NULL NULL NULL NULL bigint(20) NULL mysql help_category help_category_id smallint NULL NULL NULL NULL smallint(5) unsigned @@ -462,7 +463,7 @@ NULL mysql innodb_table_stats n_rows bigint NULL NULL NULL NULL bigint(20) unsig NULL mysql innodb_table_stats clustered_index_size bigint NULL NULL NULL NULL bigint(20) unsigned NULL mysql innodb_table_stats sum_of_other_index_sizes bigint NULL NULL NULL NULL bigint(20) unsigned NULL mysql ndb_binlog_index Position bigint NULL NULL NULL NULL bigint(20) unsigned -1.0000 mysql ndb_binlog_index File varchar 255 255 latin1 latin1_swedish_ci varchar(255) +4.0000 mysql ndb_binlog_index File varchar 255 1020 utf8mb4 utf8mb4_general_ci varchar(255) NULL mysql ndb_binlog_index epoch bigint NULL NULL NULL NULL bigint(20) unsigned NULL mysql ndb_binlog_index inserts int NULL NULL NULL NULL int(10) unsigned NULL mysql ndb_binlog_index updates int NULL NULL NULL NULL int(10) unsigned @@ -472,7 +473,7 @@ NULL mysql ndb_binlog_index orig_server_id int NULL NULL NULL NULL int(10) unsig NULL mysql ndb_binlog_index orig_epoch bigint NULL NULL NULL NULL bigint(20) unsigned NULL mysql ndb_binlog_index gci int NULL NULL NULL NULL int(10) unsigned NULL mysql ndb_binlog_index next_position bigint NULL NULL NULL NULL bigint(20) unsigned -1.0000 mysql ndb_binlog_index next_file varchar 255 255 latin1 latin1_swedish_ci varchar(255) +4.0000 mysql ndb_binlog_index next_file varchar 255 1020 utf8mb4 utf8mb4_general_ci varchar(255) 3.0000 mysql plugin name varchar 64 192 utf8 utf8_general_ci varchar(64) 3.0000 mysql plugin dl varchar 128 384 utf8 utf8_general_ci varchar(128) 3.0000 mysql proc db char 64 192 utf8 utf8_bin char(64) diff --git a/mysql-test/suite/funcs_1/r/is_events.result b/mysql-test/suite/funcs_1/r/is_events.result index dec75933776fc288dd7f0a4fbcb06fc1fd58ce7e..41dc45e20ac076cc741cc9811e40c9c53330a3a1 100644 --- a/mysql-test/suite/funcs_1/r/is_events.result +++ b/mysql-test/suite/funcs_1/r/is_events.result @@ -115,6 +115,7 @@ event_type NOT IN ('ONE TIME','RECURRING') or status NOT IN ('ENABLED','DISABLED','SLAVESIDE_DISABLED') or on_completion NOT IN ('PRESERVE','NOT PRESERVE'); event_catalog event_name event_body event_type event_type status on_completion +def daily_event SQL RECURRING RECURRING ENABLED NOT PRESERVE ######################################################################## # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and # DDL on INFORMATION_SCHEMA tables are not supported diff --git a/mysql-test/suite/funcs_1/r/is_schemata.result b/mysql-test/suite/funcs_1/r/is_schemata.result index 8751519be9037e4e1dd8ad72eba269362769fddb..66a63603e7e4d4c3fbf351575d2de2b0bcafecf4 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata.result +++ b/mysql-test/suite/funcs_1/r/is_schemata.result @@ -54,10 +54,12 @@ FROM information_schema.schemata WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL; catalog_name schema_name sql_path def information_schema NULL +def cache NULL def mtr NULL def mysql NULL def performance_schema NULL def sys NULL +def sys_stonedb NULL def test NULL ############################################################################### # Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql.result b/mysql-test/suite/funcs_1/r/is_tables_mysql.result index d46b342c01d9c1503f11ae67c799ab88dfa3c06a..45dd9d7562be30ee45176f2420a87f40f1ddbae8 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result @@ -167,7 +167,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION latin1_swedish_ci +TABLE_COLLATION utf8mb4_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -328,7 +328,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION latin1_swedish_ci +TABLE_COLLATION utf8mb4_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result index e55a79ae090762ce590099bccfd1dba53a1af743..2dc324106bd95609131dc9cb76af89cd6edccc12 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers.result +++ b/mysql-test/suite/funcs_1/r/is_triggers.result @@ -105,8 +105,8 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL OR action_reference_new_table IS NOT NULL; TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION -def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci -def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci +def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci utf8mb4_general_ci +def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci utf8mb4_general_ci def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # mysql.sys@localhost utf8 utf8_general_ci utf8_general_ci def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # mysql.sys@localhost utf8 utf8_general_ci utf8_general_ci ################################################################################## diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result index b5298f3e6e0ac72011aba6e5844efc3e7ead0755..621b0cc506ef0ad9b60a288bc8d0a2f943153e59 100644 --- a/mysql-test/suite/funcs_1/r/memory_func_view.result +++ b/mysql-test/suite/funcs_1/r/memory_func_view.result @@ -3775,7 +3775,7 @@ CAST(my_varbinary_1000 AS TIME) my_varbinary_1000 id NULL NULL 1 NULL 2 00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 23 Warnings: @@ -3813,7 +3813,7 @@ CAST(my_binary_30 AS TIME) my_binary_30 id NULL NULL 1 00:00:00 2 00:00:00 <--------30 characters-------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 NULL -1 5 41:58:00 1 17:58 22 Warnings: @@ -3851,7 +3851,7 @@ CAST(my_varchar_1000 AS TIME) my_varchar_1000 id NULL NULL 1 NULL 2 00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 21 Warnings: @@ -3887,7 +3887,7 @@ CAST(my_char_30 AS TIME) my_char_30 id NULL NULL 1 NULL 2 00:00:00 <--------30 characters-------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 20 Warnings: diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result index b5298f3e6e0ac72011aba6e5844efc3e7ead0755..621b0cc506ef0ad9b60a288bc8d0a2f943153e59 100644 --- a/mysql-test/suite/funcs_1/r/myisam_func_view.result +++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result @@ -3775,7 +3775,7 @@ CAST(my_varbinary_1000 AS TIME) my_varbinary_1000 id NULL NULL 1 NULL 2 00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 23 Warnings: @@ -3813,7 +3813,7 @@ CAST(my_binary_30 AS TIME) my_binary_30 id NULL NULL 1 00:00:00 2 00:00:00 <--------30 characters-------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 NULL -1 5 41:58:00 1 17:58 22 Warnings: @@ -3851,7 +3851,7 @@ CAST(my_varchar_1000 AS TIME) my_varchar_1000 id NULL NULL 1 NULL 2 00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 21 Warnings: @@ -3887,7 +3887,7 @@ CAST(my_char_30 AS TIME) my_char_30 id NULL NULL 1 NULL 2 00:00:00 <--------30 characters-------> 3 -00:00:00 ---äÖüß@µ*$-- 4 +-00:00:00 ---äÖüß@µ*$-- 4 -00:00:01 -1 5 41:58:00 1 17:58 20 Warnings: diff --git a/mysql-test/suite/perfschema/r/binlog_edge_mix.result b/mysql-test/suite/perfschema/r/binlog_edge_mix.result index e4b95cb69ffbc25ad7a7296c9aeca76a63abfbe1..79e2e151878eaad2924c4c0638b42766a7da1e2c 100644 --- a/mysql-test/suite/perfschema/r/binlog_edge_mix.result +++ b/mysql-test/suite/perfschema/r/binlog_edge_mix.result @@ -110,7 +110,7 @@ include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # drop database if exists my_replicated_db master-bin.000001 # Query # # BEGIN -master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'latin1_swedish_ci')) +master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8mb4'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'utf8mb4_general_ci')) master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # create database my_replicated_db master-bin.000001 # Query # # use `test`; create table my_replicated_db.my_tx_table(a bigint) engine = innodb diff --git a/mysql-test/suite/perfschema/r/binlog_edge_stmt.result b/mysql-test/suite/perfschema/r/binlog_edge_stmt.result index fa41334f69fa83d4770630a7d58e99c088dab761..200aab2552534cee8ecea3d5b80cf30de358475a 100644 --- a/mysql-test/suite/perfschema/r/binlog_edge_stmt.result +++ b/mysql-test/suite/perfschema/r/binlog_edge_stmt.result @@ -146,7 +146,7 @@ include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # drop database if exists my_replicated_db master-bin.000001 # Query # # BEGIN -master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'latin1_swedish_ci')) +master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8mb4'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'utf8mb4_general_ci')) master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # create database my_replicated_db master-bin.000001 # Query # # use `test`; create table my_replicated_db.my_tx_table(a bigint) engine = innodb diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result index 99da7acd9719e82b7c8e5f5e20900c66da29d89e..8c209a6e28f4c7e6edd501dace9b30db2a607e3e 100644 --- a/mysql-test/suite/perfschema/r/digest_table_full.result +++ b/mysql-test/suite/perfschema/r/digest_table_full.result @@ -113,7 +113,7 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARN SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS NULL NULL NULL 55 32 1 2 -statements_digest d24da32343f2b799f8a7ba1bdc45f83b TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0 +statements_digest 7d7f6351a9240688565b3dfc262eb724 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0 SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size"; Variable_name Value performance_schema_digests_size 2 diff --git a/mysql-test/suite/perfschema/r/digest_view.result b/mysql-test/suite/perfschema/r/digest_view.result index 7942b7d3c853a9b17f80dbd0cdee7603a0742c4f..86cf2813cde505f93bba4086526fd7099a9ee7d4 100644 --- a/mysql-test/suite/perfschema/r/digest_view.result +++ b/mysql-test/suite/perfschema/r/digest_view.result @@ -57,18 +57,18 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR FROM performance_schema.events_statements_summary_by_digest ORDER BY DIGEST_TEXT; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR -test faacd4387467f00e5471f3620f0053ee EXPLAIN SELECT * FROM `test` . `v1` 1 -test 75f55ccb0b365eefb51cc8f1f1d81132 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 1 -test f13826a4cdfdfc626f2f338744c9c746 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 1 -test 4204f1e3809aca8633c27c32603bcf6d EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 1 -test fff8925d7c4be86c0c3da7a26c60750e EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 1 -test a8465e96fae9df6be0af2b0bcaff9548 SELECT * FROM `test` . `v1` 1 -test 90d5479e3ca1cbf7113b3b3abc96f1ff SELECT * FROM `test` . `v1` WHERE `a` = ? 1 -test b660099c975325cd338eb80b2849bd61 SELECT * FROM `test` . `v1` WHERE `b` > ? 1 -test 9b459b7b8ce957d816066ba4ee0289f9 SELECT `a` , `b` FROM `test` . `v1` 1 -test 1c037a199783a415ae1ff2361459f1de SELECT `b` , `a` FROM `test` . `v1` 1 -test feaff321c54a9c8e1e9508628f7a5a05 SHOW WARNINGS 5 -test d24da32343f2b799f8a7ba1bdc45f83b TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 +test abb5fa70439531e49e108b689a11fbbf EXPLAIN SELECT * FROM `test` . `v1` 1 +test 0e9c761e6e6ad35d73738d792afffc26 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 1 +test 09df35f7576ef4179a3e735bb386f871 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 1 +test 250e8ab4c825bcb01fde150151e24e9c EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 1 +test cba4fcf3afac7a920cbd88651de0e3bf EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 1 +test 80c729d7ea795cc1a5b78a275ecf4866 SELECT * FROM `test` . `v1` 1 +test 1845ffec68b17085a232f9bae1920635 SELECT * FROM `test` . `v1` WHERE `a` = ? 1 +test 1cbd17e5a67bfee56fb08f56c7840f37 SELECT * FROM `test` . `v1` WHERE `b` > ? 1 +test 385f318edbfa5858e44812c9c3530b91 SELECT `a` , `b` FROM `test` . `v1` 1 +test 75df0d518cecfc2060ed51d1f272d172 SELECT `b` , `a` FROM `test` . `v1` 1 +test ecffd7b240fe37c38f36949804d0a9bd SHOW WARNINGS 5 +test 7d7f6351a9240688565b3dfc262eb724 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 DROP TABLE test.v1; CREATE VIEW test.v1 AS SELECT * FROM test.t1; EXPLAIN SELECT * from test.v1; @@ -125,20 +125,20 @@ SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR FROM performance_schema.events_statements_summary_by_digest ORDER BY DIGEST_TEXT; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR -test 1462d84ad90aeabc6106da2a5ba38f17 CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 1 -test c909e770703c59c353ca199dfe4ca154 DROP TABLE `test` . `v1` 1 -test faacd4387467f00e5471f3620f0053ee EXPLAIN SELECT * FROM `test` . `v1` 2 -test 75f55ccb0b365eefb51cc8f1f1d81132 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 2 -test f13826a4cdfdfc626f2f338744c9c746 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 2 -test 4204f1e3809aca8633c27c32603bcf6d EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 2 -test fff8925d7c4be86c0c3da7a26c60750e EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 2 -test a8465e96fae9df6be0af2b0bcaff9548 SELECT * FROM `test` . `v1` 2 -test 90d5479e3ca1cbf7113b3b3abc96f1ff SELECT * FROM `test` . `v1` WHERE `a` = ? 2 -test b660099c975325cd338eb80b2849bd61 SELECT * FROM `test` . `v1` WHERE `b` > ? 2 -test f26fa367559d55cac36428d5ebd1d511 SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 1 -test 9b459b7b8ce957d816066ba4ee0289f9 SELECT `a` , `b` FROM `test` . `v1` 2 -test 1c037a199783a415ae1ff2361459f1de SELECT `b` , `a` FROM `test` . `v1` 2 -test feaff321c54a9c8e1e9508628f7a5a05 SHOW WARNINGS 10 -test d24da32343f2b799f8a7ba1bdc45f83b TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 +test f61bbab3925c225e4270f9791638a6b6 CREATE VIEW `test` . `v1` AS SELECT * FROM `test` . `t1` 1 +test e3d21b00135f843d43dd39b8428ddaae DROP TABLE `test` . `v1` 1 +test abb5fa70439531e49e108b689a11fbbf EXPLAIN SELECT * FROM `test` . `v1` 2 +test 0e9c761e6e6ad35d73738d792afffc26 EXPLAIN SELECT * FROM `test` . `v1` WHERE `a` = ? 2 +test 09df35f7576ef4179a3e735bb386f871 EXPLAIN SELECT * FROM `test` . `v1` WHERE `b` > ? 2 +test 250e8ab4c825bcb01fde150151e24e9c EXPLAIN SELECT `a` , `b` FROM `test` . `v1` 2 +test cba4fcf3afac7a920cbd88651de0e3bf EXPLAIN SELECT `b` , `a` FROM `test` . `v1` 2 +test 80c729d7ea795cc1a5b78a275ecf4866 SELECT * FROM `test` . `v1` 2 +test 1845ffec68b17085a232f9bae1920635 SELECT * FROM `test` . `v1` WHERE `a` = ? 2 +test 1cbd17e5a67bfee56fb08f56c7840f37 SELECT * FROM `test` . `v1` WHERE `b` > ? 2 +test 661d0ff35705958cb5012286d9e0ab65 SELECT SCHEMA_NAME , `DIGEST` , `DIGEST_TEXT` , `COUNT_STAR` FROM `performance_schema` . `events_statements_summary_by_digest` ORDER BY `DIGEST_TEXT` 1 +test 385f318edbfa5858e44812c9c3530b91 SELECT `a` , `b` FROM `test` . `v1` 2 +test 75df0d518cecfc2060ed51d1f272d172 SELECT `b` , `a` FROM `test` . `v1` 2 +test ecffd7b240fe37c38f36949804d0a9bd SHOW WARNINGS 10 +test 7d7f6351a9240688565b3dfc262eb724 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 DROP VIEW test.v1; DROP TABLE test.t1; diff --git a/mysql-test/suite/perfschema/r/max_program_zero.result b/mysql-test/suite/perfschema/r/max_program_zero.result index 9a2a30f2f9e786e0902ebefb41df79d853dca7bb..d11c5cb7ed894bac7d36284e94de0575b0c4c3b4 100644 --- a/mysql-test/suite/perfschema/r/max_program_zero.result +++ b/mysql-test/suite/perfschema/r/max_program_zero.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result index cec59acea9f2115fa3b1ff9c885c7bc61f610da8..5489cfab6d6235c2abf335af7f4c4e6cd187659e 100644 --- a/mysql-test/suite/perfschema/r/relaylog.result +++ b/mysql-test/suite/perfschema/r/relaylog.result @@ -64,8 +64,8 @@ EVENT_NAME COUNT_STAR wait/synch/cond/sql/MYSQL_BIN_LOG::COND_done NONE wait/synch/cond/sql/MYSQL_BIN_LOG::prep_xids_cond NONE wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue MANY +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit NONE +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue NONE wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_done MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY @@ -161,8 +161,8 @@ EVENT_NAME COUNT_STAR wait/synch/cond/sql/MYSQL_BIN_LOG::COND_done NONE wait/synch/cond/sql/MYSQL_BIN_LOG::prep_xids_cond NONE wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_binlog_end_pos MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit MANY -wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue MANY +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit NONE +wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_commit_queue NONE wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_done MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_flush_queue MANY wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index MANY diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result index 3edbae26e31b89ef9a95470e4e647408e6f96efd..9df3dd545b566ca6e826526dbf765b7e2a6733d9 100644 Binary files a/mysql-test/suite/perfschema/r/rpl_gtid_func.result and b/mysql-test/suite/perfschema/r/rpl_gtid_func.result differ diff --git a/mysql-test/suite/perfschema/r/show_sanity.result b/mysql-test/suite/perfschema/r/show_sanity.result index dc326dd7f647110a4fb2270605885dc152a0bfca..e45c5a247a440ee6a387b7e4a7c9e63ca9f5d3a3 100644 --- a/mysql-test/suite/perfschema/r/show_sanity.result +++ b/mysql-test/suite/perfschema/r/show_sanity.result @@ -416,6 +416,60 @@ SHOW_MODE SOURCE VARIABLE_NAME 5.6 I_S.SESSION_VARIABLES LOG_STATEMENTS_UNSAFE_FOR_BINLOG 5.6 I_S.SESSION_VARIABLES REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG 5.6 I_S.SESSION_VARIABLES REPLICATION_SENDER_OBSERVE_COMMIT_ONLY +5.6 I_S.SESSION_VARIABLES STONEDB_ASYNC_JOIN +5.6 I_S.SESSION_VARIABLES STONEDB_BG_LOAD_THREADS +5.6 I_S.SESSION_VARIABLES STONEDB_CACHINGLEVEL +5.6 I_S.SESSION_VARIABLES STONEDB_COMPENSATION_START +5.6 I_S.SESSION_VARIABLES STONEDB_DATA_DISTRIBUTION_POLICY +5.6 I_S.SESSION_VARIABLES STONEDB_DISK_USAGE_THRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_DISTINCT_CACHE_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_ENABLE_HISTOGRAM_CMAP_BLOOM +5.6 I_S.SESSION_VARIABLES STONEDB_ENABLE_ROWSTORE +5.6 I_S.SESSION_VARIABLES STONEDB_FILTEREVALUATION_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_FORCE_HASHJOIN +5.6 I_S.SESSION_VARIABLES STONEDB_GLOBAL_DEBUG_LEVEL +5.6 I_S.SESSION_VARIABLES STONEDB_GROUPBY_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_HUGEFILEDIR +5.6 I_S.SESSION_VARIABLES STONEDB_INDEX_CACHE_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INDEX_SEARCH +5.6 I_S.SESSION_VARIABLES STONEDB_INI_ALLOWMYSQLQUERYPATH +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CACHEFOLDER +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CACHERELEASETHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CACHESIZETHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CONTROLQUERYLOG +5.6 I_S.SESSION_VARIABLES STONEDB_INI_KNLEVEL +5.6 I_S.SESSION_VARIABLES STONEDB_INI_PUSHDOWN +5.6 I_S.SESSION_VARIABLES STONEDB_INI_SERVERMAINHEAPSIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INI_THREADPOOLSIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INI_USEMYSQLIMPORTEXPORTDEFAULTS +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_BUFFER_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_CNTTHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_DELAYED +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_MAX_BUFFERED +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_NUMTHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_WAIT_MS +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_WAIT_TIME +5.6 I_S.SESSION_VARIABLES STONEDB_JOIN_DISABLE_SWITCH_SIDE +5.6 I_S.SESSION_VARIABLES STONEDB_JOIN_PARALLEL +5.6 I_S.SESSION_VARIABLES STONEDB_JOIN_SPLITROWS +5.6 I_S.SESSION_VARIABLES STONEDB_LOAD_THREADS +5.6 I_S.SESSION_VARIABLES STONEDB_LOOKUP_MAX_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_MAX_EXECUTION_TIME +5.6 I_S.SESSION_VARIABLES STONEDB_MINMAX_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_MM_HARDLIMIT +5.6 I_S.SESSION_VARIABLES STONEDB_MM_LARGETEMPPOOL_THRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_MM_LARGETEMPRATIO +5.6 I_S.SESSION_VARIABLES STONEDB_MM_POLICY +5.6 I_S.SESSION_VARIABLES STONEDB_MM_RELEASEPOLICY +5.6 I_S.SESSION_VARIABLES STONEDB_ORDERBY_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_PARALLEL_FILLOUTPUT +5.6 I_S.SESSION_VARIABLES STONEDB_PARALLEL_MAPJOIN +5.6 I_S.SESSION_VARIABLES STONEDB_QPS_LOG +5.6 I_S.SESSION_VARIABLES STONEDB_QUERY_THREADS +5.6 I_S.SESSION_VARIABLES STONEDB_REFRESH_SYS_STONEDB +5.6 I_S.SESSION_VARIABLES STONEDB_RESULT_SENDER_ROWS +5.6 I_S.SESSION_VARIABLES STONEDB_START_ASYNC +5.6 I_S.SESSION_VARIABLES STONEDB_SYNC_BUFFERS 5.6 I_S.SESSION_VARIABLES TLS_VERSION ================================================================================ @@ -446,6 +500,60 @@ SHOW_MODE SOURCE VARIABLE_NAME 5.6 I_S.SESSION_VARIABLES LOG_STATEMENTS_UNSAFE_FOR_BINLOG 5.6 I_S.SESSION_VARIABLES REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG 5.6 I_S.SESSION_VARIABLES REPLICATION_SENDER_OBSERVE_COMMIT_ONLY +5.6 I_S.SESSION_VARIABLES STONEDB_ASYNC_JOIN +5.6 I_S.SESSION_VARIABLES STONEDB_BG_LOAD_THREADS +5.6 I_S.SESSION_VARIABLES STONEDB_CACHINGLEVEL +5.6 I_S.SESSION_VARIABLES STONEDB_COMPENSATION_START +5.6 I_S.SESSION_VARIABLES STONEDB_DATA_DISTRIBUTION_POLICY +5.6 I_S.SESSION_VARIABLES STONEDB_DISK_USAGE_THRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_DISTINCT_CACHE_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_ENABLE_HISTOGRAM_CMAP_BLOOM +5.6 I_S.SESSION_VARIABLES STONEDB_ENABLE_ROWSTORE +5.6 I_S.SESSION_VARIABLES STONEDB_FILTEREVALUATION_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_FORCE_HASHJOIN +5.6 I_S.SESSION_VARIABLES STONEDB_GLOBAL_DEBUG_LEVEL +5.6 I_S.SESSION_VARIABLES STONEDB_GROUPBY_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_HUGEFILEDIR +5.6 I_S.SESSION_VARIABLES STONEDB_INDEX_CACHE_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INDEX_SEARCH +5.6 I_S.SESSION_VARIABLES STONEDB_INI_ALLOWMYSQLQUERYPATH +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CACHEFOLDER +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CACHERELEASETHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CACHESIZETHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INI_CONTROLQUERYLOG +5.6 I_S.SESSION_VARIABLES STONEDB_INI_KNLEVEL +5.6 I_S.SESSION_VARIABLES STONEDB_INI_PUSHDOWN +5.6 I_S.SESSION_VARIABLES STONEDB_INI_SERVERMAINHEAPSIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INI_THREADPOOLSIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INI_USEMYSQLIMPORTEXPORTDEFAULTS +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_BUFFER_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_CNTTHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_DELAYED +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_MAX_BUFFERED +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_NUMTHRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_WAIT_MS +5.6 I_S.SESSION_VARIABLES STONEDB_INSERT_WAIT_TIME +5.6 I_S.SESSION_VARIABLES STONEDB_JOIN_DISABLE_SWITCH_SIDE +5.6 I_S.SESSION_VARIABLES STONEDB_JOIN_PARALLEL +5.6 I_S.SESSION_VARIABLES STONEDB_JOIN_SPLITROWS +5.6 I_S.SESSION_VARIABLES STONEDB_LOAD_THREADS +5.6 I_S.SESSION_VARIABLES STONEDB_LOOKUP_MAX_SIZE +5.6 I_S.SESSION_VARIABLES STONEDB_MAX_EXECUTION_TIME +5.6 I_S.SESSION_VARIABLES STONEDB_MINMAX_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_MM_HARDLIMIT +5.6 I_S.SESSION_VARIABLES STONEDB_MM_LARGETEMPPOOL_THRESHOLD +5.6 I_S.SESSION_VARIABLES STONEDB_MM_LARGETEMPRATIO +5.6 I_S.SESSION_VARIABLES STONEDB_MM_POLICY +5.6 I_S.SESSION_VARIABLES STONEDB_MM_RELEASEPOLICY +5.6 I_S.SESSION_VARIABLES STONEDB_ORDERBY_SPEEDUP +5.6 I_S.SESSION_VARIABLES STONEDB_PARALLEL_FILLOUTPUT +5.6 I_S.SESSION_VARIABLES STONEDB_PARALLEL_MAPJOIN +5.6 I_S.SESSION_VARIABLES STONEDB_QPS_LOG +5.6 I_S.SESSION_VARIABLES STONEDB_QUERY_THREADS +5.6 I_S.SESSION_VARIABLES STONEDB_REFRESH_SYS_STONEDB +5.6 I_S.SESSION_VARIABLES STONEDB_RESULT_SENDER_ROWS +5.6 I_S.SESSION_VARIABLES STONEDB_START_ASYNC +5.6 I_S.SESSION_VARIABLES STONEDB_SYNC_BUFFERS 5.6 I_S.SESSION_VARIABLES TLS_VERSION ================================================================================ @@ -546,6 +654,50 @@ where show_mode = "5.7" order by show_mode, source, variable_name; SHOW_MODE SOURCE VARIABLE_NAME 5.6 I_S.GLOBAL_STATUS COM_SHUTDOWN +5.6 I_S.GLOBAL_STATUS STONEDB_DELAY_BUFFER_USAGE +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_FALSE_WAKEUP +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_HITS +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_LOAD_ERRORS +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_MISSES +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_PACK_LOADS +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_READWAIT +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_READ_WAIT_IN_PROGRESS +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_REDECOMPRESS +5.6 I_S.GLOBAL_STATUS STONEDB_GDC_RELEASED +5.6 I_S.GLOBAL_STATUS STONEDB_INSERT_PER_MINUTE +5.6 I_S.GLOBAL_STATUS STONEDB_INSERT_TOTAL +5.6 I_S.GLOBAL_STATUS STONEDB_LOAD_DUP_PER_MINUTE +5.6 I_S.GLOBAL_STATUS STONEDB_LOAD_DUP_TOTAL +5.6 I_S.GLOBAL_STATUS STONEDB_LOAD_PER_MINUTE +5.6 I_S.GLOBAL_STATUS STONEDB_LOAD_TOTAL +5.6 I_S.GLOBAL_STATUS STONEDB_MM_ALLOC_BLOCS +5.6 I_S.GLOBAL_STATUS STONEDB_MM_ALLOC_OBJS +5.6 I_S.GLOBAL_STATUS STONEDB_MM_ALLOC_PACKS +5.6 I_S.GLOBAL_STATUS STONEDB_MM_ALLOC_PACK_SIZE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_ALLOC_SIZE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_ALLOC_TEMP +5.6 I_S.GLOBAL_STATUS STONEDB_MM_ALLOC_TEMP_SIZE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_FREEABLE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_FREE_BLOCKS +5.6 I_S.GLOBAL_STATUS STONEDB_MM_FREE_PACKS +5.6 I_S.GLOBAL_STATUS STONEDB_MM_FREE_PACK_SIZE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_FREE_SIZE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_FREE_TEMP +5.6 I_S.GLOBAL_STATUS STONEDB_MM_FREE_TEMP_SIZE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_RELEASE1 +5.6 I_S.GLOBAL_STATUS STONEDB_MM_RELEASE2 +5.6 I_S.GLOBAL_STATUS STONEDB_MM_RELEASE3 +5.6 I_S.GLOBAL_STATUS STONEDB_MM_RELEASE4 +5.6 I_S.GLOBAL_STATUS STONEDB_MM_RELEASE_COUNT +5.6 I_S.GLOBAL_STATUS STONEDB_MM_RELEASE_TOTAL +5.6 I_S.GLOBAL_STATUS STONEDB_MM_RELOADED +5.6 I_S.GLOBAL_STATUS STONEDB_MM_SCALE +5.6 I_S.GLOBAL_STATUS STONEDB_MM_UNFREEABLE +5.6 I_S.GLOBAL_STATUS STONEDB_QUERY_PER_MINUTE +5.6 I_S.GLOBAL_STATUS STONEDB_QUERY_TOTAL +5.6 I_S.GLOBAL_STATUS STONEDB_ROW_STORE_USAGE +5.6 I_S.GLOBAL_STATUS STONEDB_UPDATE_PER_MINUTE +5.6 I_S.GLOBAL_STATUS STONEDB_UPDATE_TOTAL ================================================================================ TEST 8 @@ -633,6 +785,50 @@ where show_mode = "5.7" order by show_mode, source, variable_name; SHOW_MODE SOURCE VARIABLE_NAME 5.6 I_S.SESSION_STATUS COM_SHUTDOWN +5.6 I_S.SESSION_STATUS STONEDB_DELAY_BUFFER_USAGE +5.6 I_S.SESSION_STATUS STONEDB_GDC_FALSE_WAKEUP +5.6 I_S.SESSION_STATUS STONEDB_GDC_HITS +5.6 I_S.SESSION_STATUS STONEDB_GDC_LOAD_ERRORS +5.6 I_S.SESSION_STATUS STONEDB_GDC_MISSES +5.6 I_S.SESSION_STATUS STONEDB_GDC_PACK_LOADS +5.6 I_S.SESSION_STATUS STONEDB_GDC_READWAIT +5.6 I_S.SESSION_STATUS STONEDB_GDC_READ_WAIT_IN_PROGRESS +5.6 I_S.SESSION_STATUS STONEDB_GDC_REDECOMPRESS +5.6 I_S.SESSION_STATUS STONEDB_GDC_RELEASED +5.6 I_S.SESSION_STATUS STONEDB_INSERT_PER_MINUTE +5.6 I_S.SESSION_STATUS STONEDB_INSERT_TOTAL +5.6 I_S.SESSION_STATUS STONEDB_LOAD_DUP_PER_MINUTE +5.6 I_S.SESSION_STATUS STONEDB_LOAD_DUP_TOTAL +5.6 I_S.SESSION_STATUS STONEDB_LOAD_PER_MINUTE +5.6 I_S.SESSION_STATUS STONEDB_LOAD_TOTAL +5.6 I_S.SESSION_STATUS STONEDB_MM_ALLOC_BLOCS +5.6 I_S.SESSION_STATUS STONEDB_MM_ALLOC_OBJS +5.6 I_S.SESSION_STATUS STONEDB_MM_ALLOC_PACKS +5.6 I_S.SESSION_STATUS STONEDB_MM_ALLOC_PACK_SIZE +5.6 I_S.SESSION_STATUS STONEDB_MM_ALLOC_SIZE +5.6 I_S.SESSION_STATUS STONEDB_MM_ALLOC_TEMP +5.6 I_S.SESSION_STATUS STONEDB_MM_ALLOC_TEMP_SIZE +5.6 I_S.SESSION_STATUS STONEDB_MM_FREEABLE +5.6 I_S.SESSION_STATUS STONEDB_MM_FREE_BLOCKS +5.6 I_S.SESSION_STATUS STONEDB_MM_FREE_PACKS +5.6 I_S.SESSION_STATUS STONEDB_MM_FREE_PACK_SIZE +5.6 I_S.SESSION_STATUS STONEDB_MM_FREE_SIZE +5.6 I_S.SESSION_STATUS STONEDB_MM_FREE_TEMP +5.6 I_S.SESSION_STATUS STONEDB_MM_FREE_TEMP_SIZE +5.6 I_S.SESSION_STATUS STONEDB_MM_RELEASE1 +5.6 I_S.SESSION_STATUS STONEDB_MM_RELEASE2 +5.6 I_S.SESSION_STATUS STONEDB_MM_RELEASE3 +5.6 I_S.SESSION_STATUS STONEDB_MM_RELEASE4 +5.6 I_S.SESSION_STATUS STONEDB_MM_RELEASE_COUNT +5.6 I_S.SESSION_STATUS STONEDB_MM_RELEASE_TOTAL +5.6 I_S.SESSION_STATUS STONEDB_MM_RELOADED +5.6 I_S.SESSION_STATUS STONEDB_MM_SCALE +5.6 I_S.SESSION_STATUS STONEDB_MM_UNFREEABLE +5.6 I_S.SESSION_STATUS STONEDB_QUERY_PER_MINUTE +5.6 I_S.SESSION_STATUS STONEDB_QUERY_TOTAL +5.6 I_S.SESSION_STATUS STONEDB_ROW_STORE_USAGE +5.6 I_S.SESSION_STATUS STONEDB_UPDATE_PER_MINUTE +5.6 I_S.SESSION_STATUS STONEDB_UPDATE_TOTAL ================================================================================ TEST 11 diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result index 1204e4b57a9927b98f5e10c565333a5147c0b7ad..2d73dd581b49463415fdcfd0d6d3a72bd5d84ee9 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index 3aa4a6b95736aaba4f75ec8969a0b84a3a3cfca8..8d3641ff52813029d0a3ec79bd858357e081da04 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index a3f20107af5e2625d285121d616d21683da3d1fc..1c8c96fcbf481bb05dc1848a377a1d6b053f5837 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result index d77a12f83f2e0df8be0e7f1ae91158526d68c65e..6946867749baf73e07cb3e25bfc7aee959489d08 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index b59e7b0802390920f472af5d439a0943ee03e00e..88f024ad13d07c21a2e5ddc306366947f292df16 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index 7caf2863dfc4cd351a43fc3ca2912f5febea05d5..a4a27e75f5e4e6c3f547eb76a9b67dbe1e10629f 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest.result b/mysql-test/suite/perfschema/r/start_server_low_digest.result index 3911ae063b744053fa285f50dca4245e928d6b78..c35b49489cc6f6738dd1c00b5a6def8478146488 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_digest.result +++ b/mysql-test/suite/perfschema/r/start_server_low_digest.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long; event_name digest digest_text sql_text -statement/sql/truncate de142fd9a2507cb67f197230081a2682 TRUNCATE TABLE truncate table events_statements_history_long -statement/sql/select 4eaf50b33b47c3d02ab230606f197063 SELECT ? + ? + SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 +statement/sql/truncate ed4c6c4c8a08c8a9f877bc2f1495f696 TRUNCATE TABLE truncate table events_statements_history_long +statement/sql/select f5d0e87ef1cf8ded79c81ee8a5e669f4 SELECT ? + ? + SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result index 906700ba2737afb159882b880c2816be9daa3839..26542a69f7a4f5c420ed9c45fbc9e0fffdeef036 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result +++ b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long; event_name digest digest_text sql_text -statement/sql/truncate de142fd9a2507cb67f197230081a2682 TRUNCATE TABLE truncat... -statement/sql/select 4eaf50b33b47c3d02ab230606f197063 SELECT ? + ? + SELECT ... +statement/sql/truncate ed4c6c4c8a08c8a9f877bc2f1495f696 TRUNCATE TABLE truncat... +statement/sql/select f5d0e87ef1cf8ded79c81ee8a5e669f4 SELECT ? + ? + SELECT ... diff --git a/mysql-test/suite/perfschema/r/start_server_low_index.result b/mysql-test/suite/perfschema/r/start_server_low_index.result index 87ac365e02c721b1626b1afb106cc0520ab1fb3d..2b59d9a5cc4c77d47f605de847c98365d6892c1c 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_index.result +++ b/mysql-test/suite/perfschema/r/start_server_low_index.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result index 32ff64949a69eb7eb37517f4eb65d6b629dbac08..308e1c3a637b9d0cf77f9779d5461972efae3b31 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result index 7986377ec34ed36a18ddeeb9c2bab5700f024443..a1680b15cd5f316c3bd4ac8ffea52320a87bbbe7 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index d97efeaca6987022d83af0133d4fe6cafc797822..74c122d669a5f0a88cda9cc60d9c1f817126eb96 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index e3b5332b30286aeead3255bef898715e88298439..f5298a4f8d4bfadb942b17363721eef45d8673a2 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index 152452cc3730930cfcc74eb4cb725b9c29808e1c..629e2ccc7e5e8240125cd2e90b74c860197338d7 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index b3a177e5f7fc78ac5d3988b671fe3f7e7f08c98e..8e081905c2d1c255b79308c1024e8c9a8ce086eb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index 434208b573ae38efc1fbdd15e7316815c67dfacd..003daf8da94cb67eebadf27e98fb85049a1e97e6 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_index.result b/mysql-test/suite/perfschema/r/start_server_no_index.result index 31bfffc1ce7482163acd43f1328291e6022ec843..f254c0a02c894b0b8e869429e6ad4fecb53b67c5 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_index.result +++ b/mysql-test/suite/perfschema/r/start_server_no_index.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_mdl.result b/mysql-test/suite/perfschema/r/start_server_no_mdl.result index 6da730a39ea0b17e3cbdf9261c9b596b52d1c9b1..c06b549b97bc837ef0ed7d72cc625532a6e8b7d9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mdl.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result index 06f337c1dff5ae6e60b1591b58a32ee67d0ac1f5..7e0e3517abe2c4bec2feb414458c16f029fd9ed2 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index b966284b9540545ddd72f6f070dc2e96797fe6b7..a098b425a0f3e3558819667c7fcfdb6516495aa9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index ba7f80ec85781e0ec6e6985e373fc20888059733..8befa5a0674cce13ac75231893a186e3d96dc628 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result index bd5643707b1e4a250a1ac319e34b96e3e976a179..ab39405b6344681b916a62aca97f256e5ecd0e8c 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result +++ b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index 17b55f88f04477cbb8dc7a63ee4932e736626d95..d4d6d2c21639e388886948dae52ab66f852186f4 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index b8aebe52838ce9d3679100c6f353ba1419d37390..8b9c079ee42ae6d72bfd5eb7dcc5ed4811d22dad 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index c46c1b611509848f5b25f8c1144e8b7013557505..1f12527e29de85a7e81c1fb5676d31b268dd5077 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index 206ba243a023ead9961cd6d25bcc4b1306bb9744..f26714f8ed1a7269153257c45c18c54f587b9faf 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index 1a7de31d12c80fa4a304a44b5e834ec033a5e343..1ee5951eb8ad0ef94b31e2ee0e35cf1dd3d8b5eb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 0ee80fbdc344b50d4aed8c10837f0a6f17b6ccad..0f2985902792a389f41502195675bd92d7a5251f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index 83218d0cd0cc3977da6b528d51520c77c282d383..ac38de384cbc1b70d29cff335538ba715a03536b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 7605a6742ea9f576762b8d90bb1049cd0ac3ddc8..8386232a2c665438a73dca133ed26e6624325388 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index 0a657b0207d8c65c1b8c7713ece45e1b0cd387f3..6b3166562e4db9b97a4248744dd5e9c354e3b448 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result index 8340c9a065e6c46cdf1cb6fabf268f096f8206c8..9bda7acc24e9c32097776d9386c0f9bab31d8180 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result index 41ec7acac673b9115de04c8e53c3ad64064560d9..383ab2fda5b886ee08533b0b1744b99930d2dc9a 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index e730dd5f91773505e53017c810ce982323f2882e..8e7177497cf2eb3e32201ef232081a2fb938fc7b 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index e2c976555951dc52998f9315d20a7e4e8741831a..395fa00952f05944510e1061a8c8bd207a6f8070 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index a591154e1a5de3fda27905e24552437b409435be..9392d8fda0e0d7ac983102016bddcf9cc567cce9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result index ca0b4a864a91115f514eecec3b19f1acaad577fc..c0c1849d419746596429a2f69f49c65fcfa16401 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index bd2718de70d67ebdbc67eacc2ffdd8c780de7d92..6d07eab3239bbc49f913407442fa339f104c2511 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index 6eefbf7e885c4c77b115d5dc9c2c244ed48345fe..4d91175e56b4cc73abfe91ff8eb525fbfb2ad309 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result index 69e2620804532003250a7b781ab3654f560f35c5..d886bf568e7111cfe119b80ec898cb7164866e4f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result index c5f2aa23e7643f07e14a9263621bf429bd12c91c..a9a362a6bd3483b35642fe58b59a3194583c5cf5 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index 6d226ad8d5d58919e9e3e4d07cc6df4360d8e2ab..c52293c91632fd3e7b65c79276d2313d1eea0b1f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index 801b8990bdd4ea8e6c12b39c1115ddf8b43edd99..1385abc39a3c8a620516a4643c5e127a813b0dcc 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index 9a2b667d1ef7eca7666536abf1d5592943e1a960..4e360ce1ffde1e295cf092c2318a5e92694d99d2 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index 0c708b77381b64a2358c6faa6560c5bad83384f1..1f96364402b20cc653716416eb6aaebe07497e0d 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index 34ef1183e19564b770f9713f7adf09f738503255..31ff9b0bae28394452aa846b55f332db24a36882 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index 7caf2863dfc4cd351a43fc3ca2912f5febea05d5..a4a27e75f5e4e6c3f547eb76a9b67dbe1e10629f 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result index 65631bd85ca55d3f7bcedfa5f44f859256428714..5cc7f6fd9db622dab84be998093728062a227421 100644 --- a/mysql-test/suite/perfschema/r/statement_digest.result +++ b/mysql-test/suite/perfschema/r/statement_digest.result @@ -115,41 +115,41 @@ DROP TRIGGER trg; SELECT SCHEMA_NAME, DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS, SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest; SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS -statements_digest d24da32343f2b799f8a7ba1bdc45f83b TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0 -statements_digest 2470c53bba1de70e17dee0ffecf92c73 SELECT ? FROM `t1` 2 0 0 0 -statements_digest 7aaf73121c2dc1961757af496028610b SELECT ?, ... FROM `t1` 2 0 0 0 -statements_digest 57175aac3e410f4a0df5900bf998b181 SELECT ? FROM `t2` 1 0 0 0 -statements_digest 7595674dce5accccec6d0a9c0918b689 SELECT ?, ... FROM `t2` 2 0 0 0 -statements_digest 02b23366d1c2eb07f271b27a92261850 INSERT INTO `t1` VALUES (?) 2 2 0 0 -statements_digest d6935b92b93f59d1d8580d71345bf785 INSERT INTO `t2` VALUES (?) 1 1 0 0 -statements_digest 0bed9d67f8f0eed70e23d8d652f850f1 INSERT INTO `t3` VALUES (...) 4 4 0 0 -statements_digest 5a4288f864ee631ce51c9a2250ee05f4 INSERT INTO `t4` VALUES (...) 1 1 0 0 -statements_digest 2f3f80af62a9a0bc3e65ade97b7d9b91 INSERT INTO `t5` VALUES (...) 1 1 0 0 -statements_digest 9282eb80534dd560d422f0ad3e2ef79e INSERT INTO `t1` VALUES (?) /* , ... */ 2 7 0 0 -statements_digest 84fd494f2106df4a7b68a7d64c38390c INSERT INTO `t3` VALUES (...) /* , ... */ 1 3 0 0 -statements_digest 8d8c2006b523c427db1f4a64d2a3071c INSERT INTO `t5` VALUES (...) /* , ... */ 1 3 0 0 -statements_digest 119634570de383d4e24bb246f9aa5093 INSERT INTO `t6` VALUES (...) 5 5 0 0 -statements_digest d8492e72ce015b008b8a29347b1574f0 SELECT ? + ? 3 0 0 0 -statements_digest 3d4fc22e33e10d7235eced3c75a84c2c SELECT ? 1 0 0 0 -statements_digest 228bd1e66dfaad7a93a08eec7cfdf840 CREATE SCHEMA `statements_digest_temp` 2 2 0 0 -statements_digest a1b8dbf6a71e58af1c93dbdb27f2979c DROP SCHEMA `statements_digest_temp` 2 0 0 0 -statements_digest 80ef2cc343a9725239f4d9d88e3ed77b SELECT ? FROM `no_such_table` 1 0 0 1 -statements_digest 66bbd419c604f474fe5a769c3d8f091c CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 2 0 0 1 -statements_digest ae27efa5e1da98d54b2bf2af9a492780 DROP TABLE `dup_table` 1 0 0 0 -statements_digest 164476310fd2576cb913120166b2f2b0 INSERT IGNORE INTO `t11` VALUES (?) 1 1 1 0 -statements_digest feaff321c54a9c8e1e9508628f7a5a05 SHOW WARNINGS 1 0 0 0 -statements_digest ba5e1127c88c3b8737000ac83579c15b PREPARE `stmt` FROM ? 1 0 0 0 -statements_digest 9e1c48512fdded3c4e64f3ac9a786096 EXECUTE `stmt` 2 0 0 0 -statements_digest 26b3d4dd928dd5321d2a0e1e63d926f7 DEALLOCATE PREPARE `stmt` 1 0 0 0 -statements_digest 179e0cb3ea4542473dc88fd24b209049 CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 1 0 0 0 -statements_digest cde8f1053b3b4a4d67658c9c8572e765 CALL `p1` ( ) 2 0 0 0 -statements_digest ff2582be3f542ec89d41ffc8ef018c2f DROP PROCEDURE `p1` 1 0 0 0 -statements_digest bae719145a0d1e65cbbdec759665bd79 CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 1 0 0 0 -statements_digest 27b8b33b381b70df85aa39ae223baa19 SELECT `func` (...) 2 0 0 0 -statements_digest a1686531a64227fc7d1e96f090462d7b DROP FUNCTION `func` 1 0 0 0 -statements_digest 3a668f739568e34b3ae67491f7938639 CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 1 0 0 0 -statements_digest 5c24333d11c3e873088d2911f4589883 INSERT INTO `t12` VALUES (?) 2 2 0 0 -statements_digest e1ea7222497e0e50f3ee08a17ebd2542 DROP TRIGGER `trg` 1 0 0 0 +statements_digest 7d7f6351a9240688565b3dfc262eb724 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0 +statements_digest 7e736663c7e6f7c2122e450329650679 SELECT ? FROM `t1` 2 0 0 0 +statements_digest edca841268eb43a1ea051aa4737816a5 SELECT ?, ... FROM `t1` 2 0 0 0 +statements_digest 3bda6a103424f5e7ea9631767e400eee SELECT ? FROM `t2` 1 0 0 0 +statements_digest 9c7cded0f832ba7d6afc6568f2c5dd8c SELECT ?, ... FROM `t2` 2 0 0 0 +statements_digest 335997d3f7e46f98ae5ae1c6ac926a72 INSERT INTO `t1` VALUES (?) 2 2 0 0 +statements_digest e9cd6b93c19b7a01626f4c6a104d8cf4 INSERT INTO `t2` VALUES (?) 1 1 0 0 +statements_digest f19435194a6da77f758e744688bee25e INSERT INTO `t3` VALUES (...) 4 4 0 0 +statements_digest 4d12f9d1bdff8d5a728f24d8563abde7 INSERT INTO `t4` VALUES (...) 1 1 0 0 +statements_digest bb40556d2f2f36948634f1d35ee8362b INSERT INTO `t5` VALUES (...) 1 1 0 0 +statements_digest e85095faa7dd922c89a8c07948a575bd INSERT INTO `t1` VALUES (?) /* , ... */ 2 7 0 0 +statements_digest 2da724d1e65e5fea7b600461b57500ca INSERT INTO `t3` VALUES (...) /* , ... */ 1 3 0 0 +statements_digest 4a3e6a4f46655e9b2b4f58232215be01 INSERT INTO `t5` VALUES (...) /* , ... */ 1 3 0 0 +statements_digest ac15e51057a0ae54a5b67a03092df1e5 INSERT INTO `t6` VALUES (...) 5 5 0 0 +statements_digest a02910e81a481ded6aa94c5d1741ef3a SELECT ? + ? 3 0 0 0 +statements_digest 26dc86c5a23606e33aeb8eb563f9513f SELECT ? 1 0 0 0 +statements_digest 751600dc2fd6362e59cbaebd7bd5246a CREATE SCHEMA `statements_digest_temp` 2 2 0 0 +statements_digest 35a124de74cf60c8213405c00947fb3a DROP SCHEMA `statements_digest_temp` 2 0 0 0 +statements_digest 7089e7682084505527462626cb0c519d SELECT ? FROM `no_such_table` 1 0 0 1 +statements_digest 68075718e3bf936abad378b5d675026b CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 2 0 0 1 +statements_digest d5934444408f39894a5e7c76f0ce3b8a DROP TABLE `dup_table` 1 0 0 0 +statements_digest 857c618123cc348b057c310444d717db INSERT IGNORE INTO `t11` VALUES (?) 1 1 1 0 +statements_digest ecffd7b240fe37c38f36949804d0a9bd SHOW WARNINGS 1 0 0 0 +statements_digest 90a693040e3558ad531e47bc142d7cb0 PREPARE `stmt` FROM ? 1 0 0 0 +statements_digest 0887c2df36356922bd53be891f00205d EXECUTE `stmt` 2 0 0 0 +statements_digest 3610cf0c7bdd554711d7eaa7d48683a3 DEALLOCATE PREPARE `stmt` 1 0 0 0 +statements_digest c047d82b1d93651f6232e5c22789cc53 CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 1 0 0 0 +statements_digest ab8cba593d9d7039ca855403620af5fa CALL `p1` ( ) 2 0 0 0 +statements_digest 43ac17a9130ec8221c252a240af79cea DROP PROCEDURE `p1` 1 0 0 0 +statements_digest ce03f042582643dbe452e122407dbd40 CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 1 0 0 0 +statements_digest bfdcf44c6fa548a464083aebbf9957bb SELECT `func` (...) 2 0 0 0 +statements_digest bc2f53b1169b8f9b59be5178c1e3668f DROP FUNCTION `func` 1 0 0 0 +statements_digest 70294c5342e1377fc6efcb4f71af7cd4 CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 1 0 0 0 +statements_digest 8357b7ae9607f0cbba4ecd10050446e2 INSERT INTO `t12` VALUES (?) 2 2 0 0 +statements_digest 1194ba311b10d7bf60690d371b113a17 DROP TRIGGER `trg` 1 0 0 0 #################################### # CLEANUP #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result index 1f66c5aa8b573e710bcda266c66aec408a40e718..974e9b7aeabcc05fe2b83aa2fc9e6773ffb40aba 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result +++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result @@ -128,41 +128,41 @@ DROP TRIGGER trg; #################################### SELECT schema_name, digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest; schema_name digest digest_text count_star -statements_digest d24da32343f2b799f8a7ba1bdc45f83b TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 -statements_digest 2470c53bba1de70e17dee0ffecf92c73 SELECT ? FROM `t1` 2 -statements_digest 7aaf73121c2dc1961757af496028610b SELECT ?, ... FROM `t1` 2 -statements_digest 57175aac3e410f4a0df5900bf998b181 SELECT ? FROM `t2` 1 -statements_digest 7595674dce5accccec6d0a9c0918b689 SELECT ?, ... FROM `t2` 2 -statements_digest 02b23366d1c2eb07f271b27a92261850 INSERT INTO `t1` VALUES (?) 2 -statements_digest d6935b92b93f59d1d8580d71345bf785 INSERT INTO `t2` VALUES (?) 1 -statements_digest 0bed9d67f8f0eed70e23d8d652f850f1 INSERT INTO `t3` VALUES (...) 4 -statements_digest 5a4288f864ee631ce51c9a2250ee05f4 INSERT INTO `t4` VALUES (...) 1 -statements_digest 2f3f80af62a9a0bc3e65ade97b7d9b91 INSERT INTO `t5` VALUES (...) 1 -statements_digest 9282eb80534dd560d422f0ad3e2ef79e INSERT INTO `t1` VALUES (?) /* , ... */ 2 -statements_digest 84fd494f2106df4a7b68a7d64c38390c INSERT INTO `t3` VALUES (...) /* , ... */ 1 -statements_digest 8d8c2006b523c427db1f4a64d2a3071c INSERT INTO `t5` VALUES (...) /* , ... */ 1 -statements_digest 119634570de383d4e24bb246f9aa5093 INSERT INTO `t6` VALUES (...) 5 -statements_digest d8492e72ce015b008b8a29347b1574f0 SELECT ? + ? 3 -statements_digest 3d4fc22e33e10d7235eced3c75a84c2c SELECT ? 1 -statements_digest 228bd1e66dfaad7a93a08eec7cfdf840 CREATE SCHEMA `statements_digest_temp` 2 -statements_digest a1b8dbf6a71e58af1c93dbdb27f2979c DROP SCHEMA `statements_digest_temp` 2 -statements_digest 80ef2cc343a9725239f4d9d88e3ed77b SELECT ? FROM `no_such_table` 1 -statements_digest 66bbd419c604f474fe5a769c3d8f091c CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 2 -statements_digest ae27efa5e1da98d54b2bf2af9a492780 DROP TABLE `dup_table` 1 -statements_digest 164476310fd2576cb913120166b2f2b0 INSERT IGNORE INTO `t11` VALUES (?) 1 -statements_digest feaff321c54a9c8e1e9508628f7a5a05 SHOW WARNINGS 1 -statements_digest ba5e1127c88c3b8737000ac83579c15b PREPARE `stmt` FROM ? 1 -statements_digest 9e1c48512fdded3c4e64f3ac9a786096 EXECUTE `stmt` 2 -statements_digest 26b3d4dd928dd5321d2a0e1e63d926f7 DEALLOCATE PREPARE `stmt` 1 -statements_digest 179e0cb3ea4542473dc88fd24b209049 CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 1 -statements_digest cde8f1053b3b4a4d67658c9c8572e765 CALL `p1` ( ) 2 -statements_digest ff2582be3f542ec89d41ffc8ef018c2f DROP PROCEDURE `p1` 1 -statements_digest bae719145a0d1e65cbbdec759665bd79 CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 1 -statements_digest 27b8b33b381b70df85aa39ae223baa19 SELECT `func` (...) 2 -statements_digest a1686531a64227fc7d1e96f090462d7b DROP FUNCTION `func` 1 -statements_digest 3a668f739568e34b3ae67491f7938639 CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 1 -statements_digest 5c24333d11c3e873088d2911f4589883 INSERT INTO `t12` VALUES (?) 2 -statements_digest e1ea7222497e0e50f3ee08a17ebd2542 DROP TRIGGER `trg` 1 +statements_digest 7d7f6351a9240688565b3dfc262eb724 TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 +statements_digest 7e736663c7e6f7c2122e450329650679 SELECT ? FROM `t1` 2 +statements_digest edca841268eb43a1ea051aa4737816a5 SELECT ?, ... FROM `t1` 2 +statements_digest 3bda6a103424f5e7ea9631767e400eee SELECT ? FROM `t2` 1 +statements_digest 9c7cded0f832ba7d6afc6568f2c5dd8c SELECT ?, ... FROM `t2` 2 +statements_digest 335997d3f7e46f98ae5ae1c6ac926a72 INSERT INTO `t1` VALUES (?) 2 +statements_digest e9cd6b93c19b7a01626f4c6a104d8cf4 INSERT INTO `t2` VALUES (?) 1 +statements_digest f19435194a6da77f758e744688bee25e INSERT INTO `t3` VALUES (...) 4 +statements_digest 4d12f9d1bdff8d5a728f24d8563abde7 INSERT INTO `t4` VALUES (...) 1 +statements_digest bb40556d2f2f36948634f1d35ee8362b INSERT INTO `t5` VALUES (...) 1 +statements_digest e85095faa7dd922c89a8c07948a575bd INSERT INTO `t1` VALUES (?) /* , ... */ 2 +statements_digest 2da724d1e65e5fea7b600461b57500ca INSERT INTO `t3` VALUES (...) /* , ... */ 1 +statements_digest 4a3e6a4f46655e9b2b4f58232215be01 INSERT INTO `t5` VALUES (...) /* , ... */ 1 +statements_digest ac15e51057a0ae54a5b67a03092df1e5 INSERT INTO `t6` VALUES (...) 5 +statements_digest a02910e81a481ded6aa94c5d1741ef3a SELECT ? + ? 3 +statements_digest 26dc86c5a23606e33aeb8eb563f9513f SELECT ? 1 +statements_digest 751600dc2fd6362e59cbaebd7bd5246a CREATE SCHEMA `statements_digest_temp` 2 +statements_digest 35a124de74cf60c8213405c00947fb3a DROP SCHEMA `statements_digest_temp` 2 +statements_digest 7089e7682084505527462626cb0c519d SELECT ? FROM `no_such_table` 1 +statements_digest 68075718e3bf936abad378b5d675026b CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 2 +statements_digest d5934444408f39894a5e7c76f0ce3b8a DROP TABLE `dup_table` 1 +statements_digest 857c618123cc348b057c310444d717db INSERT IGNORE INTO `t11` VALUES (?) 1 +statements_digest ecffd7b240fe37c38f36949804d0a9bd SHOW WARNINGS 1 +statements_digest 90a693040e3558ad531e47bc142d7cb0 PREPARE `stmt` FROM ? 1 +statements_digest 0887c2df36356922bd53be891f00205d EXECUTE `stmt` 2 +statements_digest 3610cf0c7bdd554711d7eaa7d48683a3 DEALLOCATE PREPARE `stmt` 1 +statements_digest c047d82b1d93651f6232e5c22789cc53 CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 1 +statements_digest ab8cba593d9d7039ca855403620af5fa CALL `p1` ( ) 2 +statements_digest 43ac17a9130ec8221c252a240af79cea DROP PROCEDURE `p1` 1 +statements_digest ce03f042582643dbe452e122407dbd40 CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 1 +statements_digest bfdcf44c6fa548a464083aebbf9957bb SELECT `func` (...) 2 +statements_digest bc2f53b1169b8f9b59be5178c1e3668f DROP FUNCTION `func` 1 +statements_digest 70294c5342e1377fc6efcb4f71af7cd4 CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 1 +statements_digest 8357b7ae9607f0cbba4ecd10050446e2 INSERT INTO `t12` VALUES (?) 2 +statements_digest 1194ba311b10d7bf60690d371b113a17 DROP TRIGGER `trg` 1 SELECT digest, digest_text FROM performance_schema.events_statements_current; digest digest_text #################################### diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result index 74f407b61bed1c1d07b0e6b71d3eb099d8daf92e..f9304c03daebe887d23b3ecff4d6b9c568a137c7 100644 --- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result +++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result @@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 #################################### SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest; schema_name digest digest_text count_star -performance_schema cf0f15f15c6aa949ce95632095d6a2f5 TRUNCATE TABLE `events_statements_summary_by_digest` 1 -performance_schema 03e6b6726da02f6cde506ac276a61c08 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 1 +performance_schema 7e9248f8082cec3c168fbd1574e5ec94 TRUNCATE TABLE `events_statements_summary_by_digest` 1 +performance_schema 5bf117cbdb88e33fef7a6f49a75eab5c SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 1 diff --git a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result index 81b6bd69e5469c88e0d34cc7a4b18d17c53cae3d..9a4f2fa079fcbf83e67247cb748edfab67ad1311 100644 --- a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result +++ b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result @@ -1,10 +1,12 @@ show databases; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test select count(*) from performance_schema.performance_timers; count(*)