summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/compat/oracle/r/sp-code.result27
-rw-r--r--mysql-test/suite/compat/oracle/t/sp-code.test31
-rw-r--r--mysql-test/suite/encryption/r/corrupted_during_recovery.result2
-rw-r--r--mysql-test/suite/encryption/r/innodb_encrypt_log.result2
-rw-r--r--mysql-test/suite/encryption/t/corrupted_during_recovery.test2
-rw-r--r--mysql-test/suite/engines/funcs/r/db_alter_character_set.result560
-rw-r--r--mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result168
-rw-r--r--mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result224
-rw-r--r--mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result2352
-rw-r--r--mysql-test/suite/engines/funcs/r/db_create_character_set.result140
-rw-r--r--mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result84
-rw-r--r--mysql-test/suite/funcs_1/r/is_columns_is.result2
-rw-r--r--mysql-test/suite/funcs_1/r/is_columns_is_embedded.result2
-rw-r--r--mysql-test/suite/funcs_1/r/is_schemata.result29
-rw-r--r--mysql-test/suite/funcs_1/r/is_schemata_embedded.result35
-rw-r--r--mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result14
-rw-r--r--mysql-test/suite/galera/t/galera_load_data.cnf3
-rw-r--r--mysql-test/suite/gcol/r/gcol_bugfixes.result1
-rw-r--r--mysql-test/suite/gcol/r/innodb_virtual_stats.result12
-rw-r--r--mysql-test/suite/gcol/t/innodb_virtual_stats.test4
-rw-r--r--mysql-test/suite/innodb/r/alter_inplace_perfschema.result2
-rw-r--r--mysql-test/suite/innodb/r/innodb-analyze.result4
-rw-r--r--mysql-test/suite/innodb/r/innodb-stats-sample.result4
-rw-r--r--mysql-test/suite/innodb/r/innodb-wl5522-debug.result2
-rw-r--r--mysql-test/suite/innodb/r/innodb-wl5522.result10
-rw-r--r--mysql-test/suite/innodb/r/innodb_bug12400341.result3
-rw-r--r--mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result12
-rw-r--r--mysql-test/suite/innodb/r/monitor.result4
-rw-r--r--mysql-test/suite/innodb/r/undo_truncate.result3
-rw-r--r--mysql-test/suite/innodb/r/undo_truncate_recover.result1
-rw-r--r--mysql-test/suite/innodb/t/innodb-analyze.test32
-rw-r--r--mysql-test/suite/innodb/t/innodb-stats-sample.test32
-rw-r--r--mysql-test/suite/innodb/t/innodb-wl5522.test5
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug12400341-master.opt2
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug12400341.test5
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug53674-master.opt2
-rw-r--r--mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test16
-rw-r--r--mysql-test/suite/innodb/t/undo_truncate.test3
-rw-r--r--mysql-test/suite/innodb/t/undo_truncate_recover.test1
-rw-r--r--mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result2
-rw-r--r--mysql-test/suite/innodb_zip/r/wl5522_zip.result4
-rw-r--r--mysql-test/suite/maria/maria-autozerofill.test7
-rw-r--r--mysql-test/suite/mariabackup/absolute_ibdata_paths.opt1
-rw-r--r--mysql-test/suite/perfschema/include/event_aggregate_load.inc3
-rw-r--r--mysql-test/suite/perfschema/include/event_aggregate_setup.inc21
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate.result306
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a.result210
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result179
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result110
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result79
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_h.result275
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_u.result206
-rw-r--r--mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result175
-rw-r--r--mysql-test/suite/perfschema/r/server_init.result4
-rw-r--r--mysql-test/suite/perfschema/t/server_init.test3
-rw-r--r--mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result2
-rw-r--r--mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result2
-rw-r--r--mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result2
-rw-r--r--mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result2
-rw-r--r--mysql-test/suite/rpl/r/rpl_row_colSize.result2
-rw-r--r--mysql-test/suite/s3/alter.result103
-rw-r--r--mysql-test/suite/s3/alter.test79
-rw-r--r--mysql-test/suite/s3/amazon.result8
-rw-r--r--mysql-test/suite/s3/amazon.test28
-rw-r--r--mysql-test/suite/s3/arguments.result58
-rw-r--r--mysql-test/suite/s3/arguments.test54
-rw-r--r--mysql-test/suite/s3/basic.result105
-rw-r--r--mysql-test/suite/s3/basic.test55
-rw-r--r--mysql-test/suite/s3/create_database.inc10
-rw-r--r--mysql-test/suite/s3/discovery.result57
-rw-r--r--mysql-test/suite/s3/discovery.test84
-rw-r--r--mysql-test/suite/s3/drop_database.inc9
-rw-r--r--mysql-test/suite/s3/my.cnf11
-rw-r--r--mysql-test/suite/s3/no_s3-master.opt1
-rw-r--r--mysql-test/suite/s3/no_s3.result13
-rw-r--r--mysql-test/suite/s3/no_s3.test25
-rw-r--r--mysql-test/suite/s3/select.result8
-rw-r--r--mysql-test/suite/s3/select.test17
-rw-r--r--mysql-test/suite/s3/suite.pm8
-rw-r--r--mysql-test/suite/s3/unsupported.result8
-rw-r--r--mysql-test/suite/s3/unsupported.test31
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result4
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_checksums_basic.result53
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result53
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result10
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result64
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result77
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result6
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result100
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled1236
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff11
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled697
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_innodb.result66
-rw-r--r--mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result30
-rw-r--r--mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result2
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_checksums_basic.test106
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test106
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test64
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test72
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test4
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.opt1
-rw-r--r--mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test125
-rw-r--r--mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test1
103 files changed, 2863 insertions, 6229 deletions
diff --git a/mysql-test/suite/compat/oracle/r/sp-code.result b/mysql-test/suite/compat/oracle/r/sp-code.result
index 1c6aacc8743..0fc980a3b84 100644
--- a/mysql-test/suite/compat/oracle/r/sp-code.result
+++ b/mysql-test/suite/compat/oracle/r/sp-code.result
@@ -1487,3 +1487,30 @@ CALL p1();
x0 x1.a x1.b
100 101 102
DROP PROCEDURE p1;
+#
+# MDEV-19640 Wrong SHOW PROCEDURE output for SET GLOBAL sysvar1=expr, sysvar2=expr
+#
+CREATE OR REPLACE PROCEDURE p1() AS
+BEGIN
+SET GLOBAL max_allowed_packet=16000000, max_error_count=60;
+SELECT @@GLOBAL.max_allowed_packet, @@GLOBAL.max_error_count;
+END;
+$$
+SHOW PROCEDURE CODE p1;
+Pos Instruction
+0 stmt 31 "SET GLOBAL max_allowed_packet=16000000"
+1 stmt 31 "SET GLOBAL max_error_count=60"
+2 stmt 0 "SELECT @@GLOBAL.max_allowed_packet, @..."
+DROP PROCEDURE p1;
+#
+# MDEV-19639 sql_mode=ORACLE: Wrong SHOW PROCEDURE output for sysvar:=expr
+#
+CREATE OR REPLACE PROCEDURE p1() AS
+BEGIN
+max_error_count:=10;
+END;
+$$
+SHOW PROCEDURE CODE p1;
+Pos Instruction
+0 stmt 31 "max_error_count:=10"
+DROP PROCEDURE p1;
diff --git a/mysql-test/suite/compat/oracle/t/sp-code.test b/mysql-test/suite/compat/oracle/t/sp-code.test
index ea66ed80d2a..1ffd3b948e6 100644
--- a/mysql-test/suite/compat/oracle/t/sp-code.test
+++ b/mysql-test/suite/compat/oracle/t/sp-code.test
@@ -1055,3 +1055,34 @@ DELIMITER ;$$
SHOW PROCEDURE CODE p1;
CALL p1();
DROP PROCEDURE p1;
+
+--echo #
+--echo # MDEV-19640 Wrong SHOW PROCEDURE output for SET GLOBAL sysvar1=expr, sysvar2=expr
+--echo #
+
+DELIMITER $$;
+CREATE OR REPLACE PROCEDURE p1() AS
+BEGIN
+ SET GLOBAL max_allowed_packet=16000000, max_error_count=60;
+ SELECT @@GLOBAL.max_allowed_packet, @@GLOBAL.max_error_count;
+END;
+$$
+DELIMITER ;$$
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;
+
+--echo #
+--echo # MDEV-19639 sql_mode=ORACLE: Wrong SHOW PROCEDURE output for sysvar:=expr
+--echo #
+
+DELIMITER $$;
+CREATE OR REPLACE PROCEDURE p1() AS
+BEGIN
+ max_error_count:=10;
+END;
+$$
+DELIMITER ;$$
+SHOW PROCEDURE CODE p1;
+DROP PROCEDURE p1;
+
+
diff --git a/mysql-test/suite/encryption/r/corrupted_during_recovery.result b/mysql-test/suite/encryption/r/corrupted_during_recovery.result
index 356dce64f8d..ea2f1ff3328 100644
--- a/mysql-test/suite/encryption/r/corrupted_during_recovery.result
+++ b/mysql-test/suite/encryption/r/corrupted_during_recovery.result
@@ -1,3 +1,5 @@
+# Work around MDEV-19541
+SET GLOBAL innodb_checksum_algorithm=crc32;
CREATE TABLE t1(a BIGINT PRIMARY KEY) ENGINE=InnoDB, ENCRYPTED=YES;
INSERT INTO t1 VALUES(1);
CREATE TABLE t2(a BIGINT PRIMARY KEY) ENGINE=InnoDB, ENCRYPTED=YES;
diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log.result b/mysql-test/suite/encryption/r/innodb_encrypt_log.result
index d0c17ed09ae..e71bb6e8aec 100644
--- a/mysql-test/suite/encryption/r/innodb_encrypt_log.result
+++ b/mysql-test/suite/encryption/r/innodb_encrypt_log.result
@@ -7,7 +7,7 @@
#
SET GLOBAL innodb_log_checksums=0;
Warnings:
-Warning 138 innodb_encrypt_log implies innodb_log_checksums
+Warning 138 The parameter innodb_log_checksums is deprecated and has no effect.
SELECT @@global.innodb_log_checksums;
@@global.innodb_log_checksums
1
diff --git a/mysql-test/suite/encryption/t/corrupted_during_recovery.test b/mysql-test/suite/encryption/t/corrupted_during_recovery.test
index 42cdd13d206..7e13168e759 100644
--- a/mysql-test/suite/encryption/t/corrupted_during_recovery.test
+++ b/mysql-test/suite/encryption/t/corrupted_during_recovery.test
@@ -13,6 +13,8 @@ call mtr.add_suppression("InnoDB: Table in tablespace \\d+ encrypted. However ke
let INNODB_CHECKSUM_ALGORITHM = `SELECT @@innodb_checksum_algorithm`;
let INNODB_PAGE_SIZE=`select @@innodb_page_size`;
+--echo # Work around MDEV-19541
+SET GLOBAL innodb_checksum_algorithm=crc32;
CREATE TABLE t1(a BIGINT PRIMARY KEY) ENGINE=InnoDB, ENCRYPTED=YES;
INSERT INTO t1 VALUES(1);
# Force a redo log checkpoint.
diff --git a/mysql-test/suite/engines/funcs/r/db_alter_character_set.result b/mysql-test/suite/engines/funcs/r/db_alter_character_set.result
index 48351449a72..ad0cf41bdf1 100644
--- a/mysql-test/suite/engines/funcs/r/db_alter_character_set.result
+++ b/mysql-test/suite/engines/funcs/r/db_alter_character_set.result
@@ -43,381 +43,381 @@ cp932 SJIS for Windows Japanese cp932_japanese_ci 2
eucjpms UJIS for Windows Japanese eucjpms_japanese_ci 3
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 binary binary NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 binary binary NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 swe7 swe7_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 swe7 swe7_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 cp1251 cp1251_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 cp1251 cp1251_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 binary binary NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 binary binary NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 swe7 swe7_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 swe7 swe7_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 cp1251 cp1251_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 cp1251 cp1251_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 binary binary NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 binary binary NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 swe7 swe7_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 swe7 swe7_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 cp1251 cp1251_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 cp1251 cp1251_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 binary binary NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 binary binary NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 swe7 swe7_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 swe7 swe7_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
CREATE DATABASE d8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 latin1 latin1_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 latin1 latin1_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d8 cp1251 cp1251_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d8 cp1251 cp1251_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8;
diff --git a/mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result b/mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result
index b16ddd6e50f..d01b85d9039 100644
--- a/mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result
+++ b/mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result
@@ -1,115 +1,115 @@
DROP DATABASE IF EXISTS d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d11 CHARACTER SET utf8 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d11 CHARACTER SET latin2 COLLATE latin2_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 latin2 latin2_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 latin2 latin2_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d11 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 cp1250 cp1250_croatian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 cp1250 cp1250_croatian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d11 CHARACTER SET utf8 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d11 CHARACTER SET latin2 COLLATE latin2_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 latin2 latin2_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 latin2 latin2_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d11 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d11 cp1250 cp1250_croatian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d11 cp1250 cp1250_croatian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11;
diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
index a7217ba424e..0b06979ee1d 100644
--- a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
+++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
@@ -325,153 +325,153 @@ eucjpms_japanese_nopad_ci eucjpms 1121 # #
eucjpms_nopad_bin eucjpms 1122 # #
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 DEFAULT COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 DEFAULT COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d9 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d9 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9;
diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
index 8304b3a0f96..1b875962417 100644
--- a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
+++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
@@ -325,1597 +325,1597 @@ eucjpms_japanese_nopad_ci eucjpms 1121 # #
eucjpms_nopad_bin eucjpms 1122 # #
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_unicode_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_unicode_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_unicode_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_unicode_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_unicode_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_unicode_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_icelandic_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_icelandic_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_icelandic_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_icelandic_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_icelandic_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_icelandic_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_latvian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_latvian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_latvian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_latvian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_latvian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_latvian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_romanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_romanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_romanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_romanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_romanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_romanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_slovenian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovenian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovenian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_slovenian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovenian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovenian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_polish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_polish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_polish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_polish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_polish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_polish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_estonian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_estonian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_estonian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_estonian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_estonian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_estonian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_spanish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_spanish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_swedish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_swedish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_turkish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_turkish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_turkish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_turkish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_turkish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_turkish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_czech_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_czech_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_czech_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_czech_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_czech_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_czech_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_danish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_danish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_danish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_danish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_danish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_danish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_lithuanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_lithuanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_lithuanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_lithuanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_lithuanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_lithuanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_slovak_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovak_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovak_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_slovak_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovak_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovak_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_spanish2_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish2_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish2_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_spanish2_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish2_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish2_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_roman_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_roman_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_roman_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_roman_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_roman_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_roman_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_persian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_persian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_persian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_persian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_persian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_persian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_esperanto_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_esperanto_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_esperanto_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_esperanto_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_esperanto_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_esperanto_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 COLLATE utf8_hungarian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_hungarian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_hungarian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d10 DEFAULT COLLATE utf8_hungarian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_hungarian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_hungarian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_bin NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_bin NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_unicode_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_unicode_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_unicode_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_unicode_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_unicode_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_unicode_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_icelandic_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_icelandic_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_icelandic_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_icelandic_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_icelandic_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_icelandic_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_latvian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_latvian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_latvian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_latvian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_latvian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_latvian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_romanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_romanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_romanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_romanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_romanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_romanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_slovenian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovenian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovenian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_slovenian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovenian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovenian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_polish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_polish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_polish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_polish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_polish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_polish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_estonian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_estonian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_estonian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_estonian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_estonian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_estonian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_spanish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_spanish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_swedish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_swedish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_turkish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_turkish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_turkish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_turkish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_turkish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_turkish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_czech_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_czech_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_czech_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_czech_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_czech_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_czech_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_danish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_danish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_danish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_danish_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_danish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_danish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_lithuanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_lithuanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_lithuanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_lithuanian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_lithuanian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_lithuanian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_slovak_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovak_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovak_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_slovak_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_slovak_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_slovak_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_spanish2_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish2_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish2_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_spanish2_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_spanish2_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_spanish2_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_roman_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_roman_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_roman_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_roman_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_roman_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_roman_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_persian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_persian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_persian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_persian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_persian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_persian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_esperanto_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_esperanto_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_esperanto_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_esperanto_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_esperanto_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_esperanto_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 COLLATE utf8_hungarian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_hungarian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_hungarian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d10 DEFAULT COLLATE utf8_hungarian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d10 utf8 utf8_hungarian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d10 utf8 utf8_hungarian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d10;
diff --git a/mysql-test/suite/engines/funcs/r/db_create_character_set.result b/mysql-test/suite/engines/funcs/r/db_create_character_set.result
index 466eabce744..3c3d99bfba2 100644
--- a/mysql-test/suite/engines/funcs/r/db_create_character_set.result
+++ b/mysql-test/suite/engines/funcs/r/db_create_character_set.result
@@ -1,101 +1,101 @@
DROP DATABASE IF EXISTS d12;
CREATE DATABASE d12 CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 binary binary NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 binary binary NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 swe7 swe7_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 swe7 swe7_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 cp1251 cp1251_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 cp1251 cp1251_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12;
CREATE SCHEMA d12 CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 ascii ascii_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 ascii ascii_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 binary binary NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 binary binary NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 swe7 swe7_swedish_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 swe7 swe7_swedish_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d12 cp1251 cp1251_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d12 cp1251 cp1251_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12;
diff --git a/mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result b/mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result
index 4263454f229..236973a34fd 100644
--- a/mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result
+++ b/mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result
@@ -1,61 +1,61 @@
DROP DATABASE IF EXISTS d13;
CREATE DATABASE d13 CHARACTER SET utf8 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d13 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d13 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d13;
CREATE DATABASE d13 CHARACTER SET latin2 COLLATE latin2_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d13 latin2 latin2_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d13 latin2 latin2_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d13;
CREATE DATABASE d13 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d13 cp1250 cp1250_croatian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d13 cp1250 cp1250_croatian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP DATABASE d13;
CREATE SCHEMA d13 CHARACTER SET utf8 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d13 utf8 utf8_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d13 utf8 utf8_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d13;
CREATE SCHEMA d13 CHARACTER SET latin2 COLLATE latin2_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d13 latin2 latin2_general_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d13 latin2 latin2_general_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d13;
CREATE SCHEMA d13 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def d13 cp1250 cp1250_croatian_ci NULL
-def information_schema utf8 utf8_general_ci NULL
-def mtr latin1 latin1_swedish_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def performance_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def d13 cp1250 cp1250_croatian_ci NULL
+def information_schema utf8 utf8_general_ci NULL
+def mtr latin1 latin1_swedish_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def performance_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d13;
diff --git a/mysql-test/suite/funcs_1/r/is_columns_is.result b/mysql-test/suite/funcs_1/r/is_columns_is.result
index 386b0f07f98..00f9f347067 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result
@@ -326,6 +326,7 @@ def information_schema ROUTINES SQL_PATH 22 NULL YES varchar 64 192 NULL NULL NU
def information_schema SCHEMATA CATALOG_NAME 1 '' NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512) select NEVER NULL
def information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME 3 '' NO varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) select NEVER NULL
def information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 '' NO varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) select NEVER NULL
+def information_schema SCHEMATA SCHEMA_COMMENT 6 '' NO varchar 1024 3072 NULL NULL NULL utf8 utf8_general_ci varchar(1024) select NEVER NULL
def information_schema SCHEMATA SCHEMA_NAME 2 '' NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NEVER NULL
def information_schema SCHEMATA SQL_PATH 5 NULL YES varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512) select NEVER NULL
def information_schema SCHEMA_PRIVILEGES GRANTEE 1 '' NO varchar 190 570 NULL NULL NULL utf8 utf8_general_ci varchar(190) select NEVER NULL
@@ -870,6 +871,7 @@ NULL information_schema ROUTINES LAST_ALTERED datetime NULL NULL NULL NULL datet
3.0000 information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME varchar 32 96 utf8 utf8_general_ci varchar(32)
3.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 32 96 utf8 utf8_general_ci varchar(32)
3.0000 information_schema SCHEMATA SQL_PATH varchar 512 1536 utf8 utf8_general_ci varchar(512)
+3.0000 information_schema SCHEMATA SCHEMA_COMMENT varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
3.0000 information_schema SCHEMA_PRIVILEGES GRANTEE varchar 190 570 utf8 utf8_general_ci varchar(190)
3.0000 information_schema SCHEMA_PRIVILEGES TABLE_CATALOG varchar 512 1536 utf8 utf8_general_ci varchar(512)
3.0000 information_schema SCHEMA_PRIVILEGES TABLE_SCHEMA varchar 64 192 utf8 utf8_general_ci varchar(64)
diff --git a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
index 97346c4648d..072a90eaa50 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
@@ -326,6 +326,7 @@ def information_schema ROUTINES SQL_PATH 22 NULL YES varchar 64 192 NULL NULL NU
def information_schema SCHEMATA CATALOG_NAME 1 '' NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512) NEVER NULL
def information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME 3 '' NO varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) NEVER NULL
def information_schema SCHEMATA DEFAULT_COLLATION_NAME 4 '' NO varchar 32 96 NULL NULL NULL utf8 utf8_general_ci varchar(32) NEVER NULL
+def information_schema SCHEMATA SCHEMA_COMMENT 6 '' NO varchar 1024 3072 NULL NULL NULL utf8 utf8_general_ci varchar(1024) NEVER NULL
def information_schema SCHEMATA SCHEMA_NAME 2 '' NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) NEVER NULL
def information_schema SCHEMATA SQL_PATH 5 NULL YES varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512) NEVER NULL
def information_schema SCHEMA_PRIVILEGES GRANTEE 1 '' NO varchar 190 570 NULL NULL NULL utf8 utf8_general_ci varchar(190) NEVER NULL
@@ -870,6 +871,7 @@ NULL information_schema ROUTINES LAST_ALTERED datetime NULL NULL NULL NULL datet
3.0000 information_schema SCHEMATA DEFAULT_CHARACTER_SET_NAME varchar 32 96 utf8 utf8_general_ci varchar(32)
3.0000 information_schema SCHEMATA DEFAULT_COLLATION_NAME varchar 32 96 utf8 utf8_general_ci varchar(32)
3.0000 information_schema SCHEMATA SQL_PATH varchar 512 1536 utf8 utf8_general_ci varchar(512)
+3.0000 information_schema SCHEMATA SCHEMA_COMMENT varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
3.0000 information_schema SCHEMA_PRIVILEGES GRANTEE varchar 190 570 utf8 utf8_general_ci varchar(190)
3.0000 information_schema SCHEMA_PRIVILEGES TABLE_CATALOG varchar 512 1536 utf8 utf8_general_ci varchar(512)
3.0000 information_schema SCHEMA_PRIVILEGES TABLE_SCHEMA varchar 64 192 utf8 utf8_general_ci varchar(64)
diff --git a/mysql-test/suite/funcs_1/r/is_schemata.result b/mysql-test/suite/funcs_1/r/is_schemata.result
index 6db6ac8f150..18ee8d01147 100644
--- a/mysql-test/suite/funcs_1/r/is_schemata.result
+++ b/mysql-test/suite/funcs_1/r/is_schemata.result
@@ -33,6 +33,7 @@ SCHEMA_NAME varchar(64) NO
DEFAULT_CHARACTER_SET_NAME varchar(32) NO
DEFAULT_COLLATION_NAME varchar(32) NO
SQL_PATH varchar(512) YES NULL
+SCHEMA_COMMENT varchar(1024) NO
SHOW CREATE TABLE information_schema.SCHEMATA;
Table Create Table
SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
@@ -40,7 +41,8 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
`SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
`DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
`DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
- `SQL_PATH` varchar(512) DEFAULT NULL
+ `SQL_PATH` varchar(512) DEFAULT NULL,
+ `SCHEMA_COMMENT` varchar(1024) NOT NULL DEFAULT ''
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.SCHEMATA;
Field Type Null Key Default Extra
@@ -49,6 +51,7 @@ SCHEMA_NAME varchar(64) NO
DEFAULT_CHARACTER_SET_NAME varchar(32) NO
DEFAULT_COLLATION_NAME varchar(32) NO
SQL_PATH varchar(512) YES NULL
+SCHEMA_COMMENT varchar(1024) NO
SELECT catalog_name, schema_name, sql_path
FROM information_schema.schemata
WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL
@@ -77,9 +80,9 @@ GRANT SELECT ON db_datadict_1.* to 'testuser2'@'localhost';
GRANT SELECT ON db_datadict_2.* to 'testuser2'@'localhost';
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict_1 latin1 latin1_swedish_ci NULL
-def db_datadict_2 latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict_1 latin1 latin1_swedish_ci NULL
+def db_datadict_2 latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
db_datadict_1
@@ -87,17 +90,17 @@ db_datadict_2
connect testuser1, localhost, testuser1, , db_datadict_1;
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict_1 latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict_1 latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
db_datadict_1
connect testuser2, localhost, testuser2, , db_datadict_2;
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict_1 latin1 latin1_swedish_ci NULL
-def db_datadict_2 latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict_1 latin1 latin1_swedish_ci NULL
+def db_datadict_2 latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
db_datadict_1
@@ -105,7 +108,7 @@ db_datadict_2
connect testuser3, localhost, testuser3, , test;
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
connection default;
@@ -122,11 +125,11 @@ DROP DATABASE db_datadict_2;
#################################################################################
DROP DATABASE IF EXISTS db_datadict;
SELECT * FROM information_schema.schemata WHERE schema_name = 'db_datadict';
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
CREATE DATABASE db_datadict CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
SELECT * FROM information_schema.schemata WHERE schema_name = 'db_datadict';
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict latin1 latin1_swedish_ci NULL
SELECT schema_name, default_character_set_name
FROM information_schema.schemata WHERE schema_name = 'db_datadict';
schema_name default_character_set_name
diff --git a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
index bc993e8dc9f..6cd93190efd 100644
--- a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result
@@ -33,6 +33,7 @@ SCHEMA_NAME varchar(64) NO
DEFAULT_CHARACTER_SET_NAME varchar(32) NO
DEFAULT_COLLATION_NAME varchar(32) NO
SQL_PATH varchar(512) YES NULL
+SCHEMA_COMMENT varchar(1024) NO
SHOW CREATE TABLE information_schema.SCHEMATA;
Table Create Table
SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
@@ -40,7 +41,8 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` (
`SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
`DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
`DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
- `SQL_PATH` varchar(512) DEFAULT NULL
+ `SQL_PATH` varchar(512) DEFAULT NULL,
+ `SCHEMA_COMMENT` varchar(1024) NOT NULL DEFAULT ''
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.SCHEMATA;
Field Type Null Key Default Extra
@@ -49,6 +51,7 @@ SCHEMA_NAME varchar(64) NO
DEFAULT_CHARACTER_SET_NAME varchar(32) NO
DEFAULT_COLLATION_NAME varchar(32) NO
SQL_PATH varchar(512) YES NULL
+SCHEMA_COMMENT varchar(1024) NO
SELECT catalog_name, schema_name, sql_path
FROM information_schema.schemata
WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL
@@ -77,9 +80,9 @@ GRANT SELECT ON db_datadict_1.* to 'testuser2'@'localhost';
GRANT SELECT ON db_datadict_2.* to 'testuser2'@'localhost';
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict_1 latin1 latin1_swedish_ci NULL
-def db_datadict_2 latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict_1 latin1 latin1_swedish_ci NULL
+def db_datadict_2 latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
db_datadict_1
@@ -87,9 +90,9 @@ db_datadict_2
connect testuser1, localhost, testuser1, , db_datadict_1;
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict_1 latin1 latin1_swedish_ci NULL
-def db_datadict_2 latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict_1 latin1 latin1_swedish_ci NULL
+def db_datadict_2 latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
db_datadict_1
@@ -97,9 +100,9 @@ db_datadict_2
connect testuser2, localhost, testuser2, , db_datadict_2;
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict_1 latin1 latin1_swedish_ci NULL
-def db_datadict_2 latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict_1 latin1 latin1_swedish_ci NULL
+def db_datadict_2 latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
db_datadict_1
@@ -107,9 +110,9 @@ db_datadict_2
connect testuser3, localhost, testuser3, , test;
SELECT * FROM information_schema.schemata
WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict_1 latin1 latin1_swedish_ci NULL
-def db_datadict_2 latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict_1 latin1 latin1_swedish_ci NULL
+def db_datadict_2 latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'db_datadict_%';
Database (db_datadict_%)
db_datadict_1
@@ -128,11 +131,11 @@ DROP DATABASE db_datadict_2;
#################################################################################
DROP DATABASE IF EXISTS db_datadict;
SELECT * FROM information_schema.schemata WHERE schema_name = 'db_datadict';
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
CREATE DATABASE db_datadict CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
SELECT * FROM information_schema.schemata WHERE schema_name = 'db_datadict';
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def db_datadict latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def db_datadict latin1 latin1_swedish_ci NULL
SELECT schema_name, default_character_set_name
FROM information_schema.schemata WHERE schema_name = 'db_datadict';
schema_name default_character_set_name
diff --git a/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result b/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result
index 0679142bd82..ccf0e513d88 100644
--- a/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result
+++ b/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result
@@ -9,10 +9,10 @@ GRANT SELECT ON db_datadict.* TO 'testuser1'@'localhost';
SELECT * FROM information_schema.schemata
WHERE schema_name IN ('information_schema','mysql','test')
ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def information_schema utf8 utf8_general_ci NULL
-def mysql latin1 latin1_swedish_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def information_schema utf8 utf8_general_ci NULL
+def mysql latin1 latin1_swedish_ci NULL
+def test latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'information_schema';
Database (information_schema)
information_schema
@@ -26,9 +26,9 @@ connect testuser1, localhost, testuser1, , db_datadict;
SELECT * FROM information_schema.schemata
WHERE schema_name IN ('information_schema','mysql','test')
ORDER BY schema_name;
-CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-def information_schema utf8 utf8_general_ci NULL
-def test latin1 latin1_swedish_ci NULL
+CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH SCHEMA_COMMENT
+def information_schema utf8 utf8_general_ci NULL
+def test latin1 latin1_swedish_ci NULL
SHOW DATABASES LIKE 'information_schema';
Database (information_schema)
information_schema
diff --git a/mysql-test/suite/galera/t/galera_load_data.cnf b/mysql-test/suite/galera/t/galera_load_data.cnf
index fd0327e0ecb..5c56c92c571 100644
--- a/mysql-test/suite/galera/t/galera_load_data.cnf
+++ b/mysql-test/suite/galera/t/galera_load_data.cnf
@@ -2,9 +2,8 @@
[mysqld]
secure-file-priv = ""
-innodb_file_format ='Barracuda'
innodb_file_per_table = ON
innodb_stats_persistent=ON
innodb_stats_auto_recalc=ON
innodb_stats_persistent_sample_pages=20
-innodb_stats_sample_pages=8
+innodb_stats_transient_sample_pages=8
diff --git a/mysql-test/suite/gcol/r/gcol_bugfixes.result b/mysql-test/suite/gcol/r/gcol_bugfixes.result
index 3d19f718287..3a859116cab 100644
--- a/mysql-test/suite/gcol/r/gcol_bugfixes.result
+++ b/mysql-test/suite/gcol/r/gcol_bugfixes.result
@@ -535,7 +535,6 @@ CREATE TABLE t (a INTEGER) engine=innodb;
ALTER TABLE t ADD b INTEGER AS (SUBSTR('','a',1));
Warnings:
Warning 1292 Truncated incorrect INTEGER value: 'a'
-Warning 1292 Truncated incorrect INTEGER value: 'a'
DROP TABLE t;
set sql_mode= @save_old_sql_mode;
# Bug#21875520 Problems with virtual column indexes
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_stats.result b/mysql-test/suite/gcol/r/innodb_virtual_stats.result
index 4ef499f932f..c0f595263df 100644
--- a/mysql-test/suite/gcol/r/innodb_virtual_stats.result
+++ b/mysql-test/suite/gcol/r/innodb_virtual_stats.result
@@ -24,6 +24,9 @@ vidxcd n_diff_pfx03 c,d,DB_ROW_ID
vidxcd n_leaf_pages Number of leaf pages in the index
vidxcd size Number of pages in the index
ALTER TABLE t ADD COLUMN e INT GENERATED ALWAYS AS(a+a+b), ADD INDEX idxb (b), ALGORITHM=INPLACE;
+select count(*) from t;
+count(*)
+1
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
@@ -45,6 +48,9 @@ vidxcd n_diff_pfx03 c,d,DB_ROW_ID
vidxcd n_leaf_pages Number of leaf pages in the index
vidxcd size Number of pages in the index
ALTER TABLE t DROP COLUMN c, DROP INDEX idxa, ALGORITHM=INPLACE;
+select count(*) from t;
+count(*)
+1
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
@@ -61,6 +67,9 @@ vidxcd n_diff_pfx02 d,DB_ROW_ID
vidxcd n_leaf_pages Number of leaf pages in the index
vidxcd size Number of pages in the index
ALTER TABLE t ADD INDEX vidxe (e), ALGORITHM=INPLACE;
+select count(*) from t;
+count(*)
+1
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
@@ -81,6 +90,9 @@ vidxe n_diff_pfx02 e,DB_ROW_ID
vidxe n_leaf_pages Number of leaf pages in the index
vidxe size Number of pages in the index
ALTER TABLE t ADD COLUMN f INT GENERATED ALWAYS AS(a + a), ADD INDEX vidxf (f), ALGORITHM=INPLACE;
+select count(*) from t;
+count(*)
+1
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
diff --git a/mysql-test/suite/gcol/t/innodb_virtual_stats.test b/mysql-test/suite/gcol/t/innodb_virtual_stats.test
index 7e3c8f4e00e..69c67af8ed1 100644
--- a/mysql-test/suite/gcol/t/innodb_virtual_stats.test
+++ b/mysql-test/suite/gcol/t/innodb_virtual_stats.test
@@ -20,24 +20,28 @@ FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
ALTER TABLE t ADD COLUMN e INT GENERATED ALWAYS AS(a+a+b), ADD INDEX idxb (b), ALGORITHM=INPLACE;
+select count(*) from t;
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
ALTER TABLE t DROP COLUMN c, DROP INDEX idxa, ALGORITHM=INPLACE;
+select count(*) from t;
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
ALTER TABLE t ADD INDEX vidxe (e), ALGORITHM=INPLACE;
+select count(*) from t;
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
WHERE database_name = 'test' AND table_name = 't';
ALTER TABLE t ADD COLUMN f INT GENERATED ALWAYS AS(a + a), ADD INDEX vidxf (f), ALGORITHM=INPLACE;
+select count(*) from t;
SELECT index_name, stat_name, stat_description
FROM mysql.innodb_index_stats
diff --git a/mysql-test/suite/innodb/r/alter_inplace_perfschema.result b/mysql-test/suite/innodb/r/alter_inplace_perfschema.result
index 440a1d0d6b3..4b5a2176b87 100644
--- a/mysql-test/suite/innodb/r/alter_inplace_perfschema.result
+++ b/mysql-test/suite/innodb/r/alter_inplace_perfschema.result
@@ -12,7 +12,7 @@ SET DEBUG_SYNC = 'now WAIT_FOR go';
select count_star into @final_count from performance_schema.events_waits_summary_global_by_event_name WHERE event_name LIKE '%wait%io%file%innodb%innodb_temp_file%';
SELECT @final_count - @init_count;
@final_count - @init_count
-11
+10
SET DEBUG_SYNC = 'now SIGNAL gone';
connection ddl;
disconnect ddl;
diff --git a/mysql-test/suite/innodb/r/innodb-analyze.result b/mysql-test/suite/innodb/r/innodb-analyze.result
index 2aee004a2d6..b622992a422 100644
--- a/mysql-test/suite/innodb/r/innodb-analyze.result
+++ b/mysql-test/suite/innodb/r/innodb-analyze.result
@@ -1,2 +1,4 @@
+Warnings:
+Warning 1292 Truncated incorrect innodb_stats_transient_sample_pa value: '0'
Variable_name Value
-innodb_stats_sample_pages 1
+innodb_stats_transient_sample_pages 1
diff --git a/mysql-test/suite/innodb/r/innodb-stats-sample.result b/mysql-test/suite/innodb/r/innodb-stats-sample.result
index a049a1d82c1..dcd1a2592d7 100644
--- a/mysql-test/suite/innodb/r/innodb-stats-sample.result
+++ b/mysql-test/suite/innodb/r/innodb-stats-sample.result
@@ -1,4 +1,6 @@
+Warnings:
+Warning 1292 Truncated incorrect innodb_stats_transient_sample_pa value: '0'
Variable_name Value
-innodb_stats_sample_pages 1
+innodb_stats_transient_sample_pages 1
Variable_name Value
innodb_stats_traditional OFF
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
index ed7477fa033..2fb6d0edff5 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
@@ -867,8 +867,6 @@ SELECT COUNT(*) FROM test_wl5522.t1;
ERROR HY000: Tablespace has been discarded for table `t1`
SET SESSION debug_dbug="+d,ib_import_create_index_failure_1";
ALTER TABLE test_wl5522.t1 ADD INDEX idx(c1);
-Warnings:
-Warning 1814 Tablespace has been discarded for table `t1`
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
unlink: t1.ibd
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result
index 50330b5b164..3cc31a5b831 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522.result
@@ -285,14 +285,16 @@ ERROR HY000: Tablespace has been discarded for table `t1`
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Index x not found in tablespace meta-data file.)
+select count(*) from t1;
+ERROR HY000: Tablespace has been discarded for table `t1`
ALTER TABLE t1 DROP INDEX x;
-Warnings:
-Warning 1814 Tablespace has been discarded for table `t1`
+ALTER TABLE t1 DROP INDEX x, ALGORITHM=copy;
+ERROR 42000: Can't DROP INDEX `x`; check that it exists
ALTER TABLE t1 ADD INDEX idx(c2);
-Warnings:
-Warning 1814 Tablespace has been discarded for table `t1`
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
+Warnings:
+Warning 1814 Tablespace has been discarded for table `t1`
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
diff --git a/mysql-test/suite/innodb/r/innodb_bug12400341.result b/mysql-test/suite/innodb/r/innodb_bug12400341.result
index b402af84231..7b7f1c1a981 100644
--- a/mysql-test/suite/innodb/r/innodb_bug12400341.result
+++ b/mysql-test/suite/innodb/r/innodb_bug12400341.result
@@ -1,7 +1,5 @@
call mtr.add_suppression("InnoDB: Warning: cannot find a free slot for an undo log. Do you have too*");
call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot find a free slot for an undo log. Do you have too");
-set @old_innodb_undo_logs = @@innodb_undo_logs;
-set global innodb_undo_logs=1;
show variables like "max_connections";
Variable_name Value
max_connections 64
@@ -28,4 +26,3 @@ select count(*) from information_schema.processlist where command != 'Daemon';
count(*)
33
drop database mysqltest;
-set global innodb_undo_logs = @old_innodb_undo_logs;
diff --git a/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result b/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
index d43da0cb7b7..797c30d700f 100644
--- a/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
+++ b/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
@@ -35,7 +35,6 @@ DROP TABLE t2, t1;
# Bug#46539 Various crashes on INSERT IGNORE SELECT + SELECT
# FOR UPDATE
#
-drop table if exists t1;
create table t1 (a int primary key auto_increment,
b int, index(b)) engine=innodb;
insert into t1 (b) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -84,19 +83,12 @@ drop table t1, t2;
#
# Bug#41756 Strange error messages about locks from InnoDB
#
-drop table if exists t1;
-# In the default transaction isolation mode, and/or with
-# innodb_locks_unsafe_for_binlog=OFF, handler::unlock_row()
-# in InnoDB does nothing.
+# In the default transaction isolation mode,
+# handler::unlock_row() in InnoDB does nothing.
# Thus in order to reproduce the condition that led to the
# warning, one needs to relax isolation by either
# setting a weaker tx_isolation value, or by turning on
# the unsafe replication switch.
-# For testing purposes, choose to tweak the isolation level,
-# since it's settable at runtime, unlike
-# innodb_locks_unsafe_for_binlog, which is
-# only a command-line switch.
-#
set @@session.tx_isolation="read-committed";
# Prepare data. We need a table with a unique index,
# for join_read_key to be used. The other column
diff --git a/mysql-test/suite/innodb/r/monitor.result b/mysql-test/suite/innodb/r/monitor.result
index 4aea9fb5b0b..9b2783e9d08 100644
--- a/mysql-test/suite/innodb/r/monitor.result
+++ b/mysql-test/suite/innodb/r/monitor.result
@@ -416,7 +416,7 @@ max_count_reset, min_count_reset, count_reset, status
from information_schema.innodb_metrics
where name like "metadata%";
name max_count min_count count max_count_reset min_count_reset count_reset status
-metadata_table_handles_opened 2 NULL 2 2 NULL 2 enabled
+metadata_table_handles_opened 1 NULL 1 1 NULL 1 enabled
metadata_table_handles_closed 1 NULL 1 1 NULL 1 enabled
metadata_table_reference_count NULL NULL 0 NULL NULL 0 disabled
set global innodb_monitor_disable = module_metadata;
@@ -426,7 +426,7 @@ max_count_reset, min_count_reset, count_reset, status
from information_schema.innodb_metrics
where name like "metadata%";
name max_count min_count count max_count_reset min_count_reset count_reset status
-metadata_table_handles_opened 2 NULL 2 NULL NULL 0 disabled
+metadata_table_handles_opened 1 NULL 1 NULL NULL 0 disabled
metadata_table_handles_closed 1 NULL 1 NULL NULL 0 disabled
metadata_table_reference_count NULL NULL 0 NULL NULL 0 disabled
set global innodb_monitor_reset_all = module_metadata;
diff --git a/mysql-test/suite/innodb/r/undo_truncate.result b/mysql-test/suite/innodb/r/undo_truncate.result
index dce91a7461e..ad236bdecd4 100644
--- a/mysql-test/suite/innodb/r/undo_truncate.result
+++ b/mysql-test/suite/innodb/r/undo_truncate.result
@@ -1,8 +1,6 @@
-SET @save_undo_logs = @@GLOBAL.innodb_undo_logs;
SET @save_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET @save_truncate = @@GLOBAL.innodb_undo_log_truncate;
SET GLOBAL innodb_undo_log_truncate = 0;
-SET GLOBAL innodb_undo_logs = 4;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
SET @trunc_start=
(SELECT variable_value FROM information_schema.global_status
@@ -55,6 +53,5 @@ drop table t1, t2;
drop PROCEDURE populate_t1;
drop PROCEDURE populate_t2;
InnoDB 0 transactions not purged
-SET GLOBAL innodb_undo_logs = @save_undo_logs;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
SET GLOBAL innodb_undo_log_truncate = @save_truncate;
diff --git a/mysql-test/suite/innodb/r/undo_truncate_recover.result b/mysql-test/suite/innodb/r/undo_truncate_recover.result
index 212a1658e18..d7e6b3cf4be 100644
--- a/mysql-test/suite/innodb/r/undo_truncate_recover.result
+++ b/mysql-test/suite/innodb/r/undo_truncate_recover.result
@@ -1,4 +1,3 @@
-SET GLOBAL innodb_undo_logs = 4;
SET GLOBAL innodb_undo_log_truncate = 1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
create table t1(keyc int primary key, c char(100)) engine = innodb;
diff --git a/mysql-test/suite/innodb/t/innodb-analyze.test b/mysql-test/suite/innodb/t/innodb-analyze.test
index 0fec9968c1f..db699ad41a0 100644
--- a/mysql-test/suite/innodb/t/innodb-analyze.test
+++ b/mysql-test/suite/innodb/t/innodb-analyze.test
@@ -1,21 +1,17 @@
--source include/have_innodb.inc
#
# Test that mysqld does not crash when running ANALYZE TABLE with
-# different values of the parameter innodb_stats_sample_pages.
+# different values of the parameter innodb_stats_transient_sample_pages.
#
# we care only that the following SQL commands do not produce errors
# and do not crash the server
-- disable_query_log
--- disable_result_log
-- enable_warnings
-let $sample_pages=`select @@innodb_stats_sample_pages`;
-SET GLOBAL innodb_stats_sample_pages=0;
-
-# check that the value has been adjusted to 1
--- enable_result_log
-SHOW VARIABLES LIKE 'innodb_stats_sample_pages';
+SET @save_sample_pages = @@GLOBAL.innodb_stats_transient_sample_pages;
+SET GLOBAL innodb_stats_transient_sample_pages=0;
+SHOW VARIABLES LIKE 'innodb_stats_transient_sample_pages';
-- disable_result_log
CREATE TABLE innodb_analyze (
@@ -29,36 +25,36 @@ CREATE TABLE innodb_analyze (
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=2;
+SET GLOBAL innodb_stats_transient_sample_pages=2;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=4;
+SET GLOBAL innodb_stats_transient_sample_pages=4;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=8;
+SET GLOBAL innodb_stats_transient_sample_pages=8;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=16;
+SET GLOBAL innodb_stats_transient_sample_pages=16;
ANALYZE TABLE innodb_analyze;
INSERT INTO innodb_analyze VALUES
(1,1), (1,1), (1,2), (1,3), (1,4), (1,5),
(8,1), (8,8), (8,2), (7,1), (1,4), (3,5);
-SET GLOBAL innodb_stats_sample_pages=1;
+SET GLOBAL innodb_stats_transient_sample_pages=1;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=2;
+SET GLOBAL innodb_stats_transient_sample_pages=2;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=4;
+SET GLOBAL innodb_stats_transient_sample_pages=4;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=8;
+SET GLOBAL innodb_stats_transient_sample_pages=8;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=16;
+SET GLOBAL innodb_stats_transient_sample_pages=16;
ANALYZE TABLE innodb_analyze;
DROP TABLE innodb_analyze;
-EVAL SET GLOBAL innodb_stats_sample_pages=$sample_pages;
+SET GLOBAL innodb_stats_transient_sample_pages = @save_sample_pages;
diff --git a/mysql-test/suite/innodb/t/innodb-stats-sample.test b/mysql-test/suite/innodb/t/innodb-stats-sample.test
index 35d35bfa382..600688ab98d 100644
--- a/mysql-test/suite/innodb/t/innodb-stats-sample.test
+++ b/mysql-test/suite/innodb/t/innodb-stats-sample.test
@@ -1,24 +1,20 @@
--source include/have_innodb.inc
#
# Test that mysqld does not crash when running ANALYZE TABLE with
-# different values of the parameter innodb_stats_sample_pages.
+# different values of the parameter innodb_stats_transient_sample_pages.
#
# we care only that the following SQL commands do not produce errors
# and do not crash the server
-- disable_query_log
--- disable_result_log
-- enable_warnings
-let $sample_pages=`select @@innodb_stats_sample_pages`;
-let $traditional=`select @@innodb_stats_traditional`;
-SET GLOBAL innodb_stats_sample_pages=0;
+SET @save_sample_pages = @@GLOBAL.innodb_stats_transient_sample_pages;
+SET @save_traditional = @@GLOBAL.innodb_stats_traditional;
+SET GLOBAL innodb_stats_transient_sample_pages=0;
#use new method to calculate statistics
SET GLOBAL innodb_stats_traditional=0;
-
-# check that the value has been adjusted to 1
--- enable_result_log
-SHOW VARIABLES LIKE 'innodb_stats_sample_pages';
+SHOW VARIABLES LIKE 'innodb_stats_transient_sample_pages';
SHOW VARIABLES LIKE 'innodb_stats_traditional';
-- disable_result_log
@@ -33,13 +29,13 @@ CREATE TABLE innodb_analyze (
# test with empty table
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=2;
+SET GLOBAL innodb_stats_transient_sample_pages=2;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=1;
+SET GLOBAL innodb_stats_transient_sample_pages=1;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=8000;
+SET GLOBAL innodb_stats_transient_sample_pages=8000;
ANALYZE TABLE innodb_analyze;
delimiter //;
@@ -60,19 +56,19 @@ call innodb_insert_proc(7000);
commit;
set autocommit=1;
-SET GLOBAL innodb_stats_sample_pages=1;
+SET GLOBAL innodb_stats_transient_sample_pages=1;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=8;
+SET GLOBAL innodb_stats_transient_sample_pages=8;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=16;
+SET GLOBAL innodb_stats_transient_sample_pages=16;
ANALYZE TABLE innodb_analyze;
-SET GLOBAL innodb_stats_sample_pages=8000;
+SET GLOBAL innodb_stats_transient_sample_pages=8000;
ANALYZE TABLE innodb_analyze;
DROP PROCEDURE innodb_insert_proc;
DROP TABLE innodb_analyze;
-EVAL SET GLOBAL innodb_stats_sample_pages=$sample_pages;
-EVAL SET GLOBAL innodb_stats_traditional=$traditional; \ No newline at end of file
+SET GLOBAL innodb_stats_transient_sample_pages = @save_sample_pages;
+SET GLOBAL innodb_stats_traditional = @save_traditional;
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522.test b/mysql-test/suite/innodb/t/innodb-wl5522.test
index 744768a1d6c..e17ccf24fa6 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522.test
@@ -312,8 +312,11 @@ EOF
# This is really a name mismatch error, need better error codes.
-- error ER_TABLE_SCHEMA_MISMATCH
ALTER TABLE t1 IMPORT TABLESPACE;
-
+--error ER_TABLESPACE_DISCARDED
+select count(*) from t1;
ALTER TABLE t1 DROP INDEX x;
+--error ER_CANT_DROP_FIELD_OR_KEY
+ALTER TABLE t1 DROP INDEX x, ALGORITHM=copy;
ALTER TABLE t1 ADD INDEX idx(c2);
perl;
diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt b/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
index 13f480704f5..9f65e8b12e4 100644
--- a/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
+++ b/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
@@ -1 +1 @@
---max_connections=64 --innodb_thread_concurrency=0 --innodb_file_per_table --innodb_rollback_segments=2
+--max_connections=64 --innodb_thread_concurrency=0
diff --git a/mysql-test/suite/innodb/t/innodb_bug12400341.test b/mysql-test/suite/innodb/t/innodb_bug12400341.test
index 5fb0d63ebe7..3b5fd18a456 100644
--- a/mysql-test/suite/innodb/t/innodb_bug12400341.test
+++ b/mysql-test/suite/innodb/t/innodb_bug12400341.test
@@ -18,9 +18,6 @@ set @old_innodb_trx_rseg_n_slots_debug = @@innodb_trx_rseg_n_slots_debug;
set global innodb_trx_rseg_n_slots_debug = 32;
--enable_query_log
-set @old_innodb_undo_logs = @@innodb_undo_logs;
-set global innodb_undo_logs=1;
-
show variables like "max_connections";
show variables like "innodb_thread_concurrency";
show variables like "innodb_file_per_table";
@@ -105,8 +102,6 @@ while ($c)
#
drop database mysqltest;
-set global innodb_undo_logs = @old_innodb_undo_logs;
-
--disable_query_log
set global innodb_trx_rseg_n_slots_debug = @old_innodb_trx_rseg_n_slots_debug;
--enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb_bug53674-master.opt b/mysql-test/suite/innodb/t/innodb_bug53674-master.opt
index 1fe48c3a33a..01cf3e0520f 100644
--- a/mysql-test/suite/innodb/t/innodb_bug53674-master.opt
+++ b/mysql-test/suite/innodb/t/innodb_bug53674-master.opt
@@ -1 +1 @@
---loose-innodb-locks-unsafe-for-binlog --binlog-format=mixed
+--binlog-format=mixed
diff --git a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
index 23e8b40b010..ea31d4a14c5 100644
--- a/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
+++ b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
@@ -49,9 +49,6 @@ DROP TABLE t2, t1;
--echo # Bug#46539 Various crashes on INSERT IGNORE SELECT + SELECT
--echo # FOR UPDATE
--echo #
---disable_warnings
-drop table if exists t1;
---enable_warnings
create table t1 (a int primary key auto_increment,
b int, index(b)) engine=innodb;
insert into t1 (b) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -107,21 +104,12 @@ drop table t1, t2;
--echo #
--echo # Bug#41756 Strange error messages about locks from InnoDB
--echo #
---disable_warnings
-drop table if exists t1;
---enable_warnings
---echo # In the default transaction isolation mode, and/or with
---echo # innodb_locks_unsafe_for_binlog=OFF, handler::unlock_row()
---echo # in InnoDB does nothing.
+--echo # In the default transaction isolation mode,
+--echo # handler::unlock_row() in InnoDB does nothing.
--echo # Thus in order to reproduce the condition that led to the
--echo # warning, one needs to relax isolation by either
--echo # setting a weaker tx_isolation value, or by turning on
--echo # the unsafe replication switch.
---echo # For testing purposes, choose to tweak the isolation level,
---echo # since it's settable at runtime, unlike
---echo # innodb_locks_unsafe_for_binlog, which is
---echo # only a command-line switch.
---echo #
set @@session.tx_isolation="read-committed";
--echo # Prepare data. We need a table with a unique index,
diff --git a/mysql-test/suite/innodb/t/undo_truncate.test b/mysql-test/suite/innodb/t/undo_truncate.test
index af6ed2b4372..b4c8e46150b 100644
--- a/mysql-test/suite/innodb/t/undo_truncate.test
+++ b/mysql-test/suite/innodb/t/undo_truncate.test
@@ -2,11 +2,9 @@
--source include/innodb_page_size.inc
--source include/have_undo_tablespaces.inc
-SET @save_undo_logs = @@GLOBAL.innodb_undo_logs;
SET @save_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET @save_truncate = @@GLOBAL.innodb_undo_log_truncate;
SET GLOBAL innodb_undo_log_truncate = 0;
-SET GLOBAL innodb_undo_logs = 4;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
SET @trunc_start=
@@ -117,6 +115,5 @@ if ($size1 == $size2)
}
}
-SET GLOBAL innodb_undo_logs = @save_undo_logs;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
SET GLOBAL innodb_undo_log_truncate = @save_truncate;
diff --git a/mysql-test/suite/innodb/t/undo_truncate_recover.test b/mysql-test/suite/innodb/t/undo_truncate_recover.test
index a143c25eaf0..2bcf031f02f 100644
--- a/mysql-test/suite/innodb/t/undo_truncate_recover.test
+++ b/mysql-test/suite/innodb/t/undo_truncate_recover.test
@@ -11,7 +11,6 @@
# Tests with embedded server do not support restarting
--source include/not_embedded.inc
-SET GLOBAL innodb_undo_logs = 4;
SET GLOBAL innodb_undo_log_truncate = 1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
index b3a4ad2b0ba..864ffba2117 100644
--- a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
+++ b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result
@@ -503,8 +503,6 @@ SELECT COUNT(*) FROM test_wl5522.t1;
ERROR HY000: Tablespace has been discarded for table `t1`
SET SESSION debug_dbug="+d,ib_import_create_index_failure_1";
ALTER TABLE test_wl5522.t1 ADD INDEX idx(c1);
-Warnings:
-Warning 1814 Tablespace has been discarded for table `t1`
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE test_wl5522.t1;
unlink: t1.ibd
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_zip.result
index 03bfd2cac7a..9d6bcb3629f 100644
--- a/mysql-test/suite/innodb_zip/r/wl5522_zip.result
+++ b/mysql-test/suite/innodb_zip/r/wl5522_zip.result
@@ -265,13 +265,13 @@ restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Index x not found in tablespace meta-data file.)
ALTER TABLE t1 DROP INDEX x;
-Warnings:
-Warning 1814 Tablespace has been discarded for table `t1`
ALTER TABLE t1 ADD INDEX idx(c2);
Warnings:
Warning 1814 Tablespace has been discarded for table `t1`
restore: t1 .ibd and .cfg files
ALTER TABLE t1 IMPORT TABLESPACE;
+Warnings:
+Warning 1814 Tablespace has been discarded for table `t1`
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
diff --git a/mysql-test/suite/maria/maria-autozerofill.test b/mysql-test/suite/maria/maria-autozerofill.test
index 4baa118302c..c24f89576f8 100644
--- a/mysql-test/suite/maria/maria-autozerofill.test
+++ b/mysql-test/suite/maria/maria-autozerofill.test
@@ -115,7 +115,14 @@ check table t5;
# Check that if we zerofill with aria_chk, we should not get any warnings when
# accessing the table
+--error 0,1,11,139
--exec $MARIA_CHK --ignore-control-file --zerofill $MYSQLD_DATADIR/mysqltest/t6 >$MYSQLTEST_VARDIR/tmp/autozerofill.txt 2>&1
+if ($sys_errno != 0)
+{
+--cat_file $MYSQLTEST_VARDIR/tmp/autozerofill.txt
+--die
+}
+
select * from t6;
check table t6;
diff --git a/mysql-test/suite/mariabackup/absolute_ibdata_paths.opt b/mysql-test/suite/mariabackup/absolute_ibdata_paths.opt
index 6c6a45cb572..49297a84918 100644
--- a/mysql-test/suite/mariabackup/absolute_ibdata_paths.opt
+++ b/mysql-test/suite/mariabackup/absolute_ibdata_paths.opt
@@ -1,2 +1,3 @@
--innodb --innodb-data-home-dir= --innodb-data-file-path=$MYSQLTEST_VARDIR/tmp/absolute_path_ibdata1:6M;ibdata_second:1M:autoextend
--innodb-undo-tablespaces=2
+--innodb-checksum-algorithm=crc32
diff --git a/mysql-test/suite/perfschema/include/event_aggregate_load.inc b/mysql-test/suite/perfschema/include/event_aggregate_load.inc
index 68dbde276df..6e632b98c62 100644
--- a/mysql-test/suite/perfschema/include/event_aggregate_load.inc
+++ b/mysql-test/suite/perfschema/include/event_aggregate_load.inc
@@ -27,9 +27,6 @@ execute dump_hosts;
# Notes about this test
#
-# Each connect causes 2 wait/synch/mutex/sql/LOCK_connection_count events:
-# - 1 in mysqld.cc, create_new_thread(), for the main thread
-# - 1 in sql_connect.cc, check_user(), for the connected thread
# The main thread does not count for BY_ACCOUNT / BY_HOST.
# The user thread does count for BY_ACCOUNT, BY_HOST
#
diff --git a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
index f116b09ff04..59431e31682 100644
--- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
+++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
@@ -111,8 +111,7 @@ update performance_schema.threads set instrumented='NO';
update performance_schema.setup_instruments set enabled='NO', timed='NO';
update performance_schema.setup_instruments set enabled='YES', timed='YES'
- where name in ('wait/synch/mutex/sql/LOCK_connection_count',
- 'wait/synch/mutex/sql/LOCK_user_locks',
+ where name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log',
'idle');
@@ -181,8 +180,7 @@ begin
if (my_thread_id is not null) then
select username, event_name, count_star
from performance_schema.events_waits_summary_by_thread_by_event_name
- where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
- 'wait/synch/mutex/sql/LOCK_user_locks',
+ where event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
and thread_id = my_thread_id
@@ -199,8 +197,7 @@ prepare dump_waits_account from
"select user, host, event_name, count_star
from performance_schema.events_waits_summary_by_account_by_event_name
where user like \'user%\'
- and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
- 'wait/synch/mutex/sql/LOCK_user_locks',
+ and event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by user, host, event_name;";
@@ -209,8 +206,7 @@ prepare dump_waits_user from
"select user, event_name, count_star
from performance_schema.events_waits_summary_by_user_by_event_name
where user like \'user%\'
- and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
- 'wait/synch/mutex/sql/LOCK_user_locks',
+ and event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by user, event_name;";
@@ -219,8 +215,7 @@ prepare dump_waits_host from
"select host, event_name, count_star
from performance_schema.events_waits_summary_by_host_by_event_name
where host=\'localhost\'
- and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
- 'wait/synch/mutex/sql/LOCK_user_locks',
+ and event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by host, event_name;";
@@ -228,8 +223,7 @@ prepare dump_waits_host from
prepare dump_waits_global from
"select event_name, count_star
from performance_schema.events_waits_summary_global_by_event_name
- where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
- 'wait/synch/mutex/sql/LOCK_user_locks',
+ where event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
order by event_name;";
@@ -237,8 +231,7 @@ prepare dump_waits_global from
prepare dump_waits_history from
"select event_name, count(event_name)
from performance_schema.events_waits_history_long
- where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
- 'wait/synch/mutex/sql/LOCK_user_locks',
+ where event_name in ('wait/synch/mutex/sql/LOCK_user_locks',
'wait/synch/rwlock/sql/LOCK_grant',
'wait/io/file/sql/query_log')
group by event_name order by event_name;";
diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result
index 7fa08534bb1..23f88479a94 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate.result
@@ -15,13 +15,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -79,7 +77,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -91,25 +88,21 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 1
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 1
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -195,7 +188,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -207,25 +199,21 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -312,12 +300,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -327,33 +313,27 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -467,12 +447,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -482,33 +460,27 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -615,17 +587,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -633,41 +602,33 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -801,17 +762,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -819,41 +777,33 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -980,70 +930,56 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -1197,70 +1133,56 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -1409,71 +1331,57 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
-localhost wait/synch/mutex/sql/LOCK_connection_count 1
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1620,66 +1528,53 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
-localhost wait/synch/mutex/sql/LOCK_connection_count 2
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1828,61 +1723,49 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
-localhost wait/synch/mutex/sql/LOCK_connection_count 3
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2034,55 +1917,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2235,55 +2107,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2435,55 +2296,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2635,55 +2485,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2835,55 +2674,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3035,55 +2863,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3235,55 +3052,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3435,55 +3241,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3635,55 +3430,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3835,55 +3619,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4035,55 +3808,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4235,55 +3997,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4435,55 +4186,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4635,55 +4375,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4835,55 +4564,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -5035,55 +4753,44 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -5237,37 +4944,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -5383,19 +5083,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -5471,19 +5168,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
index 19dec52aa47..32bf988e63a 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
@@ -15,13 +15,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -78,7 +76,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -92,19 +89,16 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 1
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -179,7 +173,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -193,19 +186,16 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -281,12 +271,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -298,23 +286,19 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -407,12 +391,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -424,23 +406,19 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -526,17 +504,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -546,27 +521,22 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -669,17 +639,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -689,27 +656,22 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -805,22 +767,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
@@ -828,31 +786,25 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -965,22 +917,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -988,31 +936,25 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -1120,17 +1062,14 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -1138,37 +1077,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
-localhost wait/synch/mutex/sql/LOCK_connection_count 1
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1274,12 +1206,10 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -1287,37 +1217,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
-localhost wait/synch/mutex/sql/LOCK_connection_count 2
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1425,7 +1348,6 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -1433,37 +1355,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
-localhost wait/synch/mutex/sql/LOCK_connection_count 3
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1576,37 +1491,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1720,37 +1628,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1863,37 +1764,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2006,37 +1900,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2149,37 +2036,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2292,37 +2172,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2435,37 +2308,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2578,37 +2444,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2721,37 +2580,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2864,37 +2716,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3007,37 +2852,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3150,37 +2988,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3293,37 +3124,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3436,37 +3260,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3579,37 +3396,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3722,37 +3532,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3865,37 +3668,30 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4010,19 +3806,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4097,19 +3890,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
index 3aa27664cac..b172ab33969 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
@@ -17,7 +17,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -64,7 +63,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -78,7 +76,6 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -86,7 +83,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -151,7 +147,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -165,7 +160,6 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -173,7 +167,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -239,12 +232,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -256,11 +247,9 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -268,7 +257,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -351,12 +339,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -368,11 +354,9 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -380,7 +364,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -456,17 +439,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -476,15 +456,12 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -492,7 +469,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -585,17 +561,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -605,15 +578,12 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -621,7 +591,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -707,22 +676,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
@@ -730,19 +695,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -750,7 +711,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -853,22 +813,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -876,19 +832,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -896,7 +848,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -994,17 +945,14 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -1012,19 +960,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1032,13 +976,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1134,12 +1076,10 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -1147,19 +1087,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1167,13 +1103,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1271,7 +1205,6 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -1279,19 +1212,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1299,13 +1228,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1408,19 +1335,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1428,13 +1351,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1538,19 +1459,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1558,13 +1475,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1667,19 +1582,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1687,13 +1598,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1796,19 +1705,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -1816,13 +1721,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1925,19 +1828,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -1945,13 +1844,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2054,19 +1951,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2074,13 +1967,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2183,19 +2074,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2203,13 +2090,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2312,19 +2197,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2332,13 +2213,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2441,19 +2320,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2461,13 +2336,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2570,19 +2443,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2590,13 +2459,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2699,19 +2566,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2719,13 +2582,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2828,19 +2689,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2848,13 +2705,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2957,19 +2812,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2977,13 +2828,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3086,19 +2935,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3106,13 +2951,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3215,19 +3058,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3235,13 +3074,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3344,19 +3181,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3364,13 +3197,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3473,19 +3304,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3493,13 +3320,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3606,13 +3431,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3679,13 +3502,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
index 4d4a842948f..1ac9fc38274 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
@@ -15,13 +15,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -77,7 +75,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -93,13 +90,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 1
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -163,7 +158,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -179,13 +173,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -250,12 +242,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -269,13 +259,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -347,12 +335,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -366,13 +352,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -437,17 +421,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -459,13 +440,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -537,17 +516,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -559,13 +535,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -630,22 +604,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
@@ -655,13 +625,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -733,22 +701,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -758,13 +722,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -831,17 +793,14 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -851,19 +810,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
-localhost wait/synch/mutex/sql/LOCK_connection_count 1
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -928,12 +884,10 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -943,19 +897,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
-localhost wait/synch/mutex/sql/LOCK_connection_count 2
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1022,7 +973,6 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -1032,19 +982,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
-localhost wait/synch/mutex/sql/LOCK_connection_count 3
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1118,19 +1065,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1205,19 +1149,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1291,19 +1232,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1377,19 +1315,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1463,19 +1398,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1549,19 +1481,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1635,19 +1564,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1721,19 +1647,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1807,19 +1730,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1893,19 +1813,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1979,19 +1896,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2065,19 +1979,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2151,19 +2062,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2237,19 +2145,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2323,19 +2228,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2409,19 +2311,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2495,19 +2394,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2581,19 +2477,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2667,19 +2560,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
index db281652c0c..4b522c1a5dd 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
@@ -17,7 +17,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -63,7 +62,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -81,7 +79,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -135,7 +132,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -153,7 +149,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -208,12 +203,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -229,7 +222,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -291,12 +283,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -312,7 +302,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -367,17 +356,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -391,7 +377,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -453,17 +438,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -477,7 +459,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -532,22 +513,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
@@ -559,7 +536,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -621,22 +597,18 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -648,7 +620,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -705,17 +676,14 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -727,13 +695,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -788,12 +754,10 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -805,13 +769,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -868,7 +830,6 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
@@ -880,13 +841,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -952,13 +911,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1025,13 +982,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1097,13 +1052,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1169,13 +1122,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1241,13 +1192,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1313,13 +1262,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1385,13 +1332,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1457,13 +1402,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1529,13 +1472,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1601,13 +1542,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1673,13 +1612,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1745,13 +1682,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1817,13 +1752,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1889,13 +1822,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1961,13 +1892,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2033,13 +1962,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2105,13 +2032,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2177,13 +2102,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2249,13 +2172,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
index c8996fa2846..3ca29d4d235 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
@@ -17,7 +17,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -65,7 +64,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -77,13 +75,11 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 1
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -91,7 +87,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -167,7 +162,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -179,13 +173,11 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -193,7 +185,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -270,12 +261,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -285,21 +274,17 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -307,7 +292,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -411,12 +395,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -426,21 +408,17 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -448,7 +426,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -545,17 +522,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -563,29 +537,23 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -593,7 +561,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -717,17 +684,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -735,29 +699,23 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -765,7 +723,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -882,58 +839,46 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -941,7 +886,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -1085,58 +1029,46 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1144,7 +1076,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -1283,53 +1214,42 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1337,13 +1257,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1480,48 +1398,38 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1529,13 +1437,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1674,43 +1580,34 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1718,13 +1615,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1866,37 +1761,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -1904,13 +1791,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2053,37 +1938,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -2091,13 +1968,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2239,37 +2114,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 5
-user1 wait/synch/mutex/sql/LOCK_connection_count 1
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
user2 wait/io/file/sql/query_log 5
-user2 wait/synch/mutex/sql/LOCK_connection_count 1
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
user3 wait/io/file/sql/query_log 5
-user3 wait/synch/mutex/sql/LOCK_connection_count 1
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
user4 wait/io/file/sql/query_log 5
-user4 wait/synch/mutex/sql/LOCK_connection_count 1
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_host;
@@ -2277,13 +2144,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2425,37 +2290,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2463,13 +2320,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2611,37 +2466,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2649,13 +2496,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2797,37 +2642,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -2835,13 +2672,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2983,37 +2818,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3021,13 +2848,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3169,37 +2994,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3207,13 +3024,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3355,37 +3170,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3393,13 +3200,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3541,37 +3346,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3579,13 +3376,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3727,37 +3522,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3765,13 +3552,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3913,37 +3698,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -3951,13 +3728,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4099,37 +3874,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -4137,13 +3904,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4285,37 +4050,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -4323,13 +4080,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4471,37 +4226,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -4509,13 +4256,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4657,37 +4402,29 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -4695,13 +4432,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4845,19 +4580,15 @@ user host event_name count_star
execute dump_waits_user;
user event_name count_star
user1 wait/io/file/sql/query_log 0
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
user2 wait/io/file/sql/query_log 0
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
user3 wait/io/file/sql/query_log 0
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
user4 wait/io/file/sql/query_log 0
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_host;
@@ -4865,13 +4596,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4979,13 +4708,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -5053,13 +4780,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
index 508a65d9ba0..be6f3e272d9 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
@@ -15,13 +15,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -78,7 +76,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -90,7 +87,6 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 1
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -98,13 +94,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 1
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -179,7 +173,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -191,7 +184,6 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -199,13 +191,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 4
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -281,12 +271,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -296,11 +284,9 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -308,13 +294,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 5
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -407,12 +391,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -422,11 +404,9 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -434,13 +414,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 8
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -526,17 +504,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -544,15 +519,12 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -560,13 +532,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 9
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -669,17 +639,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -687,15 +654,12 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -703,13 +667,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 12
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -805,40 +767,32 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -846,13 +800,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 13
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -965,40 +917,32 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1006,13 +950,11 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 16
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -1120,35 +1062,28 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1156,19 +1091,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 17
-localhost wait/synch/mutex/sql/LOCK_connection_count 1
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1274,30 +1206,24 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1305,19 +1231,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 18
-localhost wait/synch/mutex/sql/LOCK_connection_count 2
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1425,25 +1348,20 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1451,19 +1369,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 19
-localhost wait/synch/mutex/sql/LOCK_connection_count 3
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1574,19 +1489,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1594,19 +1505,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1718,19 +1626,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1738,19 +1642,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1861,19 +1762,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -1881,19 +1778,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2004,19 +1898,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2024,19 +1914,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 20
-localhost wait/synch/mutex/sql/LOCK_connection_count 4
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2147,19 +2034,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2167,19 +2050,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2290,19 +2170,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2310,19 +2186,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2433,19 +2306,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2453,19 +2322,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2576,19 +2442,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2596,19 +2458,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2719,19 +2578,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2739,19 +2594,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2862,19 +2714,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2882,19 +2730,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3005,19 +2850,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3025,19 +2866,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3148,19 +2986,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3168,19 +3002,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3291,19 +3122,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3311,19 +3138,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3434,19 +3258,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3454,19 +3274,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3577,19 +3394,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3597,19 +3410,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3720,19 +3530,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3740,19 +3546,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3867,19 +3670,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3954,19 +3754,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -4041,19 +3838,16 @@ user event_name count_star
execute dump_waits_host;
host event_name count_star
localhost wait/io/file/sql/query_log 0
-localhost wait/synch/mutex/sql/LOCK_connection_count 0
localhost wait/synch/mutex/sql/LOCK_user_locks 0
localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
index 579fadc51c0..6ca450ab864 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
@@ -17,7 +17,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -64,7 +63,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 1
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -76,7 +74,6 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 1
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -86,7 +83,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 1
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
@@ -151,7 +147,6 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -163,7 +158,6 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -173,7 +167,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 4
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -239,12 +232,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 1
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -254,11 +245,9 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 1
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -268,7 +257,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 5
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_history;
@@ -351,12 +339,10 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -366,11 +352,9 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -380,7 +364,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 8
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -456,17 +439,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 1
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 0
username status
@@ -474,15 +454,12 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 1
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -492,7 +469,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 9
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 2
execute dump_waits_history;
@@ -585,17 +561,14 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username status
@@ -603,15 +576,12 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -621,7 +591,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 12
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -707,40 +676,32 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 1
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 1
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -750,7 +711,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 13
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 3
execute dump_waits_history;
@@ -853,40 +813,32 @@ connection default;
call dump_thread();
username event_name count_star
user1 wait/io/file/sql/query_log 4
-user1 wait/synch/mutex/sql/LOCK_connection_count 0
user1 wait/synch/mutex/sql/LOCK_user_locks 0
user1 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 4
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -896,7 +848,6 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 16
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
@@ -994,35 +945,28 @@ username status
user1 not found
username event_name count_star
user2 wait/io/file/sql/query_log 4
-user2 wait/synch/mutex/sql/LOCK_connection_count 0
user2 wait/synch/mutex/sql/LOCK_user_locks 0
user2 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 4
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1032,13 +976,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 17
-wait/synch/mutex/sql/LOCK_connection_count 1
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1134,30 +1076,24 @@ username status
user2 not found
username event_name count_star
user3 wait/io/file/sql/query_log 4
-user3 wait/synch/mutex/sql/LOCK_connection_count 0
user3 wait/synch/mutex/sql/LOCK_user_locks 0
user3 wait/synch/rwlock/sql/LOCK_grant 1
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 4
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1167,13 +1103,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 18
-wait/synch/mutex/sql/LOCK_connection_count 2
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1271,25 +1205,20 @@ username status
user3 not found
username event_name count_star
user4 wait/io/file/sql/query_log 4
-user4 wait/synch/mutex/sql/LOCK_connection_count 0
user4 wait/synch/mutex/sql/LOCK_user_locks 0
user4 wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 4
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1299,13 +1228,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 19
-wait/synch/mutex/sql/LOCK_connection_count 3
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1406,19 +1333,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1428,13 +1351,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1536,19 +1457,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 5
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 1
user2 localhost wait/io/file/sql/query_log 5
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 1
user3 localhost wait/io/file/sql/query_log 5
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 1
user4 localhost wait/io/file/sql/query_log 5
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 1
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 1
execute dump_waits_user;
@@ -1558,13 +1475,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1665,19 +1580,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -1687,13 +1598,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1794,19 +1703,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -1816,13 +1721,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -1923,19 +1826,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -1945,13 +1844,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2052,19 +1949,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2074,13 +1967,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2181,19 +2072,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2203,13 +2090,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2310,19 +2195,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2332,13 +2213,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2439,19 +2318,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2461,13 +2336,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2568,19 +2441,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2590,13 +2459,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2697,19 +2564,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2719,13 +2582,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2826,19 +2687,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2848,13 +2705,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -2955,19 +2810,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -2977,13 +2828,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3084,19 +2933,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3106,13 +2951,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3213,19 +3056,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3235,13 +3074,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3342,19 +3179,15 @@ user4 not found
execute dump_waits_account;
user host event_name count_star
user1 localhost wait/io/file/sql/query_log 0
-user1 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user1 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user1 localhost wait/synch/rwlock/sql/LOCK_grant 0
user2 localhost wait/io/file/sql/query_log 0
-user2 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user2 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user2 localhost wait/synch/rwlock/sql/LOCK_grant 0
user3 localhost wait/io/file/sql/query_log 0
-user3 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user3 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user3 localhost wait/synch/rwlock/sql/LOCK_grant 0
user4 localhost wait/io/file/sql/query_log 0
-user4 localhost wait/synch/mutex/sql/LOCK_connection_count 0
user4 localhost wait/synch/mutex/sql/LOCK_user_locks 0
user4 localhost wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_user;
@@ -3364,13 +3197,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3477,13 +3308,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3550,13 +3379,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
@@ -3623,13 +3450,11 @@ host event_name count_star
execute dump_waits_global;
event_name count_star
wait/io/file/sql/query_log 0
-wait/synch/mutex/sql/LOCK_connection_count 0
wait/synch/mutex/sql/LOCK_user_locks 0
wait/synch/rwlock/sql/LOCK_grant 0
execute dump_waits_history;
event_name count(event_name)
wait/io/file/sql/query_log 20
-wait/synch/mutex/sql/LOCK_connection_count 4
wait/synch/rwlock/sql/LOCK_grant 4
execute dump_stages_account;
user host event_name count_star
diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result
index 25f3f180735..d2f370cf00a 100644
--- a/mysql-test/suite/perfschema/r/server_init.result
+++ b/mysql-test/suite/perfschema/r/server_init.result
@@ -88,10 +88,6 @@ where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
count(name)
1
select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_connection_count";
-count(name)
-1
-select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_server_started";
count(name)
1
diff --git a/mysql-test/suite/perfschema/t/server_init.test b/mysql-test/suite/perfschema/t/server_init.test
index 36e09adea78..19ed7ba97c7 100644
--- a/mysql-test/suite/perfschema/t/server_init.test
+++ b/mysql-test/suite/perfschema/t/server_init.test
@@ -86,9 +86,6 @@ select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/LOCK_connection_count";
-
-select count(name) from mutex_instances
where name like "wait/synch/mutex/sql/LOCK_server_started";
# LOG_INFO object are created on demand, and are not global.
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
index 3aa7c07a845..968d469fc8d 100644
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
@@ -510,7 +510,7 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
connection slave;
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
-Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'blob' to type 'varchar(254)''
*** Drop t11 ***
connection master;
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
index 0918364b28e..9be792a41fc 100644
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
@@ -510,7 +510,7 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
connection slave;
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
-Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'blob' to type 'varchar(254)''
*** Drop t11 ***
connection master;
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
index 456c1c24f8f..0017b8f7f99 100644
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
@@ -102,7 +102,7 @@ INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TEST
********************************************
connection slave;
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
-Last_SQL_Error = 'Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)''
+Last_SQL_Error = 'Column 0 of table 'test.t3' cannot be converted from type 'blob' to type 'int(11)''
*** Drop t3 ***
connection master;
DROP TABLE t3;
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
index 7178a2a78b8..487c2c88b18 100644
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
@@ -102,7 +102,7 @@ INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TEST
********************************************
connection slave;
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
-Last_SQL_Error = 'Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)''
+Last_SQL_Error = 'Column 0 of table 'test.t3' cannot be converted from type 'blob' to type 'int(11)''
*** Drop t3 ***
connection master;
DROP TABLE t3;
diff --git a/mysql-test/suite/rpl/r/rpl_row_colSize.result b/mysql-test/suite/rpl/r/rpl_row_colSize.result
index dd324ef7807..d36f1964334 100644
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result
@@ -334,7 +334,7 @@ INSERT INTO t1 VALUES ('This is a test.');
connection slave;
START SLAVE;
include/wait_for_slave_sql_error.inc [errno=1677]
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob''
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'longblob' to type 'tinyblob''
SELECT COUNT(*) FROM t1;
COUNT(*)
0
diff --git a/mysql-test/suite/s3/alter.result b/mysql-test/suite/s3/alter.result
new file mode 100644
index 00000000000..f8faa5d4eee
--- /dev/null
+++ b/mysql-test/suite/s3/alter.result
@@ -0,0 +1,103 @@
+drop table if exists t1,t2,t3;
+#
+# Test ALTER TABLE to and from s3
+#
+create table t1 (a int, b int) engine=aria;
+insert into t1 select seq,seq+10 from seq_1_to_1000;
+alter table t1 engine=s3;
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+alter table t1 comment="hello";
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+alter table t1 engine=aria;
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+select count(*), sum(a), sum(b) from t1;
+count(*) sum(a) sum(b)
+1000 500500 510500
+drop table t1;
+#
+# Test ALTER TABLE to and from s3 with rename
+#
+create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_10;
+alter table t1 rename to t2, engine=s3;
+select count(*), sum(a), sum(b) from t2;
+count(*) sum(a) sum(b)
+10 55 155
+show create table t2;
+Table Create Table
+t2 CREATE TABLE `t2` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+alter table t2 rename to t3, engine=aria;
+show create table t3;
+Table Create Table
+t3 CREATE TABLE `t3` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+select count(*), sum(a), sum(b) from t3;
+count(*) sum(a) sum(b)
+10 55 155
+drop table t3;
+#
+# Test changing options for a s3 table
+#
+create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_1000;
+alter table t1 engine=s3;
+alter table t1 engine=s3, compression_algorithm="zlib";
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib'
+select count(*), sum(a), sum(b) from t1;
+count(*) sum(a) sum(b)
+1000 500500 510500
+drop table t1;
+#
+# Test ALTER TABLE for S3
+#
+create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_10;
+alter table t1 add column c int, engine=s3;
+alter table t1 add column d int;
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL,
+ `c` int(11) DEFAULT NULL,
+ `d` int(11) DEFAULT NULL
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+select count(*), sum(a), sum(b), sum(c), sum(d) from t1;
+count(*) sum(a) sum(b) sum(c) sum(d)
+10 55 155 NULL NULL
+drop table t1;
+#
+# Test RENAME TABLE
+#
+create table t1 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t1 engine=s3;
+rename table t1 to t3;
+alter table t3 rename t2;
+select count(*), sum(a), sum(b) from t2;
+count(*) sum(a) sum(b)
+10 55 155
+select count(*), sum(a), sum(b) from t1;
+ERROR 42S02: Table 'database.t1' doesn't exist
+drop table t2;
diff --git a/mysql-test/suite/s3/alter.test b/mysql-test/suite/s3/alter.test
new file mode 100644
index 00000000000..b14eb2cb52a
--- /dev/null
+++ b/mysql-test/suite/s3/alter.test
@@ -0,0 +1,79 @@
+--source include/have_s3.inc
+--source include/have_sequence.inc
+
+#
+# Create unique database for running the tests
+#
+--source create_database.inc
+--disable_warnings
+drop table if exists t1,t2,t3;
+--enable_warnings
+
+--echo #
+--echo # Test ALTER TABLE to and from s3
+--echo #
+
+create table t1 (a int, b int) engine=aria;
+insert into t1 select seq,seq+10 from seq_1_to_1000;
+alter table t1 engine=s3;
+show create table t1;
+alter table t1 comment="hello";
+show create table t1;
+alter table t1 engine=aria;
+show create table t1;
+select count(*), sum(a), sum(b) from t1;
+drop table t1;
+
+--echo #
+--echo # Test ALTER TABLE to and from s3 with rename
+--echo #
+
+create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_10;
+alter table t1 rename to t2, engine=s3;
+select count(*), sum(a), sum(b) from t2;
+show create table t2;
+alter table t2 rename to t3, engine=aria;
+show create table t3;
+select count(*), sum(a), sum(b) from t3;
+drop table t3;
+
+--echo #
+--echo # Test changing options for a s3 table
+--echo #
+
+create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_1000;
+alter table t1 engine=s3;
+alter table t1 engine=s3, compression_algorithm="zlib";
+show create table t1;
+select count(*), sum(a), sum(b) from t1;
+drop table t1;
+
+--echo #
+--echo # Test ALTER TABLE for S3
+--echo #
+
+create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_10;
+alter table t1 add column c int, engine=s3;
+alter table t1 add column d int;
+show create table t1;
+select count(*), sum(a), sum(b), sum(c), sum(d) from t1;
+drop table t1;
+
+--echo #
+--echo # Test RENAME TABLE
+--echo #
+
+create table t1 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t1 engine=s3;
+rename table t1 to t3;
+alter table t3 rename t2;
+select count(*), sum(a), sum(b) from t2;
+--replace_result $database database
+--error ER_NO_SUCH_TABLE
+select count(*), sum(a), sum(b) from t1;
+drop table t2;
+
+#
+# clean up
+#
+--source drop_database.inc
diff --git a/mysql-test/suite/s3/amazon.result b/mysql-test/suite/s3/amazon.result
new file mode 100644
index 00000000000..7a02fbdfadd
--- /dev/null
+++ b/mysql-test/suite/s3/amazon.result
@@ -0,0 +1,8 @@
+set @save_s3_protocol_version=@@global.s3_protocol_version;
+set @@global.s3_protocol_version="Original";
+create table t1 (pk int primary key, a int);
+insert into t1 values (1,1),(2,2),(3,3),(4,4);
+alter table t1 engine=S3;
+ERROR HY000: Got error from put_object(database/t1/frm): 8 Access Denied
+drop table t1;
+set @@global.s3_protocol_version=@save_s3_protocol_version;
diff --git a/mysql-test/suite/s3/amazon.test b/mysql-test/suite/s3/amazon.test
new file mode 100644
index 00000000000..4cb968831cb
--- /dev/null
+++ b/mysql-test/suite/s3/amazon.test
@@ -0,0 +1,28 @@
+--source include/have_s3.inc
+
+if (`SELECT @@s3_host_name <> "s3.amazonaws.com"`)
+{
+ skip Not connected to AWS;
+}
+
+--source create_database.inc
+
+#
+# Check options against amazon
+#
+
+set @save_s3_protocol_version=@@global.s3_protocol_version;
+set @@global.s3_protocol_version="Original";
+
+create table t1 (pk int primary key, a int);
+insert into t1 values (1,1),(2,2),(3,3),(4,4);
+--replace_result $database database
+--error 3
+alter table t1 engine=S3;
+drop table t1;
+
+#
+# clean up
+#
+set @@global.s3_protocol_version=@save_s3_protocol_version;
+--source drop_database.inc
diff --git a/mysql-test/suite/s3/arguments.result b/mysql-test/suite/s3/arguments.result
new file mode 100644
index 00000000000..4a371aabc9b
--- /dev/null
+++ b/mysql-test/suite/s3/arguments.result
@@ -0,0 +1,58 @@
+drop table if exists t1;
+#
+# Test options
+#
+create or replace table t1 (a int, b int, key(a)) engine=aria;
+insert into t1 select seq,seq+10 from seq_1_to_10;
+alter table t1 engine=s3, s3_block_size=819200, compression_algorithm="zlib";
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL,
+ KEY `a` (`a`)
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `s3_block_size`=819200 `compression_algorithm`='zlib'
+alter table t1 engine=s3, s3_block_size=8192;
+ERROR HY000: Incorrect value '8192' for option 's3_block_size'
+alter table t1 engine=s3, s3_block_size=65536;
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL,
+ KEY `a` (`a`)
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
+alter table t1 engine=s3, s3_block_size=100000;
+ERROR HY000: Incorrect value '100000' for option 's3_block_size'
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL,
+ KEY `a` (`a`)
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
+alter table t1 engine=s3, compression_algorithm="wss";
+ERROR HY000: Incorrect value 'wss' for option 'compression_algorithm'
+drop table t1;
+# Check that key variables are not shown to the end user
+show variables like "s3%key";
+Variable_name Value
+s3_access_key *****
+s3_secret_key *****
+# Show some "static" s3 variables
+set @tmp= @@global.s3_block_size;
+show variables like "s3_block_size";
+Variable_name Value
+s3_block_size 4194304
+set @@global.s3_block_size=65536;
+show variables like "s3_block_size";
+Variable_name Value
+s3_block_size 65536
+set @@global.s3_block_size= @tmp;
+set @@s3_block_size=65536;
+ERROR HY000: Variable 's3_block_size' is a GLOBAL variable and should be set with SET GLOBAL
+# Check s3 variables that can't be changed by end user
+set @@s3_access_key="abc";
+ERROR HY000: Variable 's3_access_key' is a read only variable
+set @@s3_secret_key="abc";
+ERROR HY000: Variable 's3_secret_key' is a read only variable
diff --git a/mysql-test/suite/s3/arguments.test b/mysql-test/suite/s3/arguments.test
new file mode 100644
index 00000000000..76ef4c960dd
--- /dev/null
+++ b/mysql-test/suite/s3/arguments.test
@@ -0,0 +1,54 @@
+--source include/have_s3.inc
+--source include/have_sequence.inc
+
+#
+# Create unique database for running the tests
+#
+--source create_database.inc
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+--echo #
+--echo # Test options
+--echo #
+
+create or replace table t1 (a int, b int, key(a)) engine=aria;
+insert into t1 select seq,seq+10 from seq_1_to_10;
+alter table t1 engine=s3, s3_block_size=819200, compression_algorithm="zlib";
+show create table t1;
+--error ER_BAD_OPTION_VALUE
+alter table t1 engine=s3, s3_block_size=8192;
+alter table t1 engine=s3, s3_block_size=65536;
+show create table t1;
+--error ER_BAD_OPTION_VALUE
+alter table t1 engine=s3, s3_block_size=100000;
+show create table t1;
+--error ER_BAD_OPTION_VALUE
+alter table t1 engine=s3, compression_algorithm="wss";
+drop table t1;
+
+--echo # Check that key variables are not shown to the end user
+
+show variables like "s3%key";
+
+--echo # Show some "static" s3 variables
+set @tmp= @@global.s3_block_size;
+show variables like "s3_block_size";
+set @@global.s3_block_size=65536;
+show variables like "s3_block_size";
+set @@global.s3_block_size= @tmp;
+--error ER_GLOBAL_VARIABLE
+set @@s3_block_size=65536;
+
+--echo # Check s3 variables that can't be changed by end user
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set @@s3_access_key="abc";
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set @@s3_secret_key="abc";
+
+#
+# clean up
+#
+--source drop_database.inc
diff --git a/mysql-test/suite/s3/basic.result b/mysql-test/suite/s3/basic.result
new file mode 100644
index 00000000000..d6e6f86f598
--- /dev/null
+++ b/mysql-test/suite/s3/basic.result
@@ -0,0 +1,105 @@
+drop table if exists t1;
+#
+# Test simple create of s3 table
+#
+create or replace table t1 (a int, b int, key (a)) engine=aria;
+insert into t1 select seq,seq+10 from seq_1_to_10000;
+alter table t1 engine=s3;
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL,
+ KEY `a` (`a`)
+) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+select * from information_schema.tables where table_schema="database" and table_name="t1";;
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT MAX_INDEX_LENGTH TEMPORARY
+def # t1 BASE TABLE S3 10 Page 10000 33 335872 # 122880 0 NULL # # # latin1_swedish_ci NULL page_checksum=1 9007199254732800 #
+show table status like "t1";
+Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary
+t1 S3 10 Page 10000 33 335872 # 122880 0 NULL # # # latin1_swedish_ci NULL page_checksum=1 # N
+select * from t1 limit 10;
+a b
+1 11
+2 12
+3 13
+4 14
+5 15
+6 16
+7 17
+8 18
+9 19
+10 20
+select count(*) from t1;
+count(*)
+10000
+select * from t1 where a between 10 and 20;
+a b
+10 20
+11 21
+12 22
+13 23
+14 24
+15 25
+16 26
+17 27
+18 28
+19 29
+20 30
+explain select * from t1 where a between 10 and 20;
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 range a a 5 NULL # Using index condition
+insert into t1 values (1,1);
+ERROR HY000: Table 't1' is read only
+update t1 set b=100 where a=1;
+ERROR HY000: Table 't1' is read only
+delete from t1 where a>10;
+ERROR HY000: Table 't1' is read only
+alter table t1 engine=aria;
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) DEFAULT NULL,
+ `b` int(11) DEFAULT NULL,
+ KEY `a` (`a`)
+) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+select * from t1 limit 10;
+a b
+1 11
+2 12
+3 13
+4 14
+5 15
+6 16
+7 17
+8 18
+9 19
+10 20
+select count(*) from t1;
+count(*)
+10000
+delete from t1 where a=1;
+drop table t1;
+#
+# status
+#
+show variables like "s3%";
+Variable_name Value
+s3_access_key X
+s3_block_size X
+s3_bucket X
+s3_host_name X
+s3_pagecache_age_threshold X
+s3_pagecache_buffer_size X
+s3_pagecache_division_limit X
+s3_pagecache_file_hash_size X
+s3_protocol_version X
+s3_region X
+s3_secret_key X
+show status like "s3%";
+Variable_name Value
+S3_pagecache_blocks_not_flushed X
+S3_pagecache_blocks_unused X
+S3_pagecache_blocks_used X
+S3_pagecache_read_requests X
+S3_pagecache_reads X
diff --git a/mysql-test/suite/s3/basic.test b/mysql-test/suite/s3/basic.test
new file mode 100644
index 00000000000..f3f53a55a1c
--- /dev/null
+++ b/mysql-test/suite/s3/basic.test
@@ -0,0 +1,55 @@
+--source include/have_s3.inc
+--source include/have_sequence.inc
+
+#
+# Create unique database for running the tests
+#
+--source create_database.inc
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+--echo #
+--echo # Test simple create of s3 table
+--echo #
+
+create or replace table t1 (a int, b int, key (a)) engine=aria;
+insert into t1 select seq,seq+10 from seq_1_to_10000;
+alter table t1 engine=s3;
+show create table t1;
+
+--replace_column 2 # 11 # 15 # 16 # 17 # 23 #
+--replace_result $database database
+--eval select * from information_schema.tables where table_schema="$database" and table_name="t1";
+--replace_column 8 # 12 # 13 # 14 # 19 #
+show table status like "t1";
+select * from t1 limit 10;
+select count(*) from t1;
+select * from t1 where a between 10 and 20;
+--replace_column 9 #
+explain select * from t1 where a between 10 and 20;
+--error ER_OPEN_AS_READONLY
+insert into t1 values (1,1);
+--error ER_OPEN_AS_READONLY
+update t1 set b=100 where a=1;
+--error ER_OPEN_AS_READONLY
+delete from t1 where a>10;
+alter table t1 engine=aria;
+show create table t1;
+select * from t1 limit 10;
+select count(*) from t1;
+delete from t1 where a=1;
+drop table t1;
+
+--echo #
+--echo # status
+--echo #
+
+--replace_column 2 X
+show variables like "s3%";
+--replace_column 2 X
+show status like "s3%";
+#
+# clean up
+#
+--source drop_database.inc
diff --git a/mysql-test/suite/s3/create_database.inc b/mysql-test/suite/s3/create_database.inc
new file mode 100644
index 00000000000..880cdd3a8d5
--- /dev/null
+++ b/mysql-test/suite/s3/create_database.inc
@@ -0,0 +1,10 @@
+#
+# Create unique database to not conflict with concurrently running tests as
+# the s3 database is shared
+#
+
+let $database=`select concat("s3_test_",replace(uuid(),"-",""))`;
+--disable_query_log
+--eval create database $database;
+--eval use $database;
+--enable_query_log
diff --git a/mysql-test/suite/s3/discovery.result b/mysql-test/suite/s3/discovery.result
new file mode 100644
index 00000000000..abc97867e89
--- /dev/null
+++ b/mysql-test/suite/s3/discovery.result
@@ -0,0 +1,57 @@
+drop table if exists t1,t2;
+#
+# Test discovery of s3
+#
+create table t1 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t1 engine=s3;
+#
+# Check discovery by select
+#
+flush tables;
+select * from t1 limit 1;
+a b
+1 11
+#
+# Check if changes to .frm is copied to S3
+#
+alter table t1 change column b c int not null;
+flush tables;
+select * from t1 limit 1;
+a c
+1 11
+#
+# Check if SHOW TABLES finds the S3 tables
+#
+create table t2 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t2 engine=s3;
+flush tables;
+SHOW TABLES;
+Tables_in_database
+t1
+t2
+drop table t2;
+#
+# Check if DROP TABLE works with discovery
+#
+select count(*) from t1;
+count(*)
+10
+flush tables;
+drop table t1;
+select count(*), sum(a) from t1;
+ERROR 42S02: Table 'database.t1' doesn't exist
+#
+# Check if S3 detects that the .frm is too old
+#
+create table t1 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t1 engine=s3;
+alter table t1 add column c int, engine=s3;
+flush tables;
+select * from t1 limit 1;
+a b c
+1 11 NULL
+flush tables;
+select * from t1 limit 1;
+a b c
+1 11 NULL
+drop table t1;
diff --git a/mysql-test/suite/s3/discovery.test b/mysql-test/suite/s3/discovery.test
new file mode 100644
index 00000000000..b85776acac5
--- /dev/null
+++ b/mysql-test/suite/s3/discovery.test
@@ -0,0 +1,84 @@
+--source include/have_s3.inc
+--source include/have_sequence.inc
+
+#
+# Create unique database for running the tests
+#
+--source create_database.inc
+--disable_warnings
+drop table if exists t1,t2;
+--enable_warnings
+
+let $datadir=`select @@datadir`;
+
+--echo #
+--echo # Test discovery of s3
+--echo #
+
+create table t1 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t1 engine=s3;
+
+--echo #
+--echo # Check discovery by select
+--echo #
+
+--remove_file $datadir/$database/t1.frm
+flush tables;
+select * from t1 limit 1;
+
+--echo #
+--echo # Check if changes to .frm is copied to S3
+--echo #
+
+alter table t1 change column b c int not null;
+flush tables;
+--remove_file $datadir/$database/t1.frm
+select * from t1 limit 1;
+
+--echo #
+--echo # Check if SHOW TABLES finds the S3 tables
+--echo #
+
+create table t2 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t2 engine=s3;
+
+flush tables;
+--remove_file $datadir/$database/t1.frm
+--replace_result $database database
+SHOW TABLES;
+drop table t2;
+
+--echo #
+--echo # Check if DROP TABLE works with discovery
+--echo #
+
+select count(*) from t1;
+flush tables;
+--remove_file $datadir/$database/t1.frm
+drop table t1;
+--replace_result $database database
+--error ER_NO_SUCH_TABLE
+select count(*), sum(a) from t1;
+
+--echo #
+--echo # Check if S3 detects that the .frm is too old
+--echo #
+
+create table t1 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
+alter table t1 engine=s3;
+--copy_file $datadir/$database/t1.frm $datadir/$database/t1.frm-old
+alter table t1 add column c int, engine=s3;
+flush tables;
+--remove_file $datadir/$database/t1.frm
+--copy_file $datadir/$database/t1.frm-old $datadir/$database/t1.frm
+--remove_file $datadir/$database/t1.frm-old
+select * from t1 limit 1;
+flush tables;
+--remove_file $datadir/$database/t1.frm
+select * from t1 limit 1;
+drop table t1;
+
+#
+# clean up
+#
+--source drop_database.inc
diff --git a/mysql-test/suite/s3/drop_database.inc b/mysql-test/suite/s3/drop_database.inc
new file mode 100644
index 00000000000..a5425f4ed47
--- /dev/null
+++ b/mysql-test/suite/s3/drop_database.inc
@@ -0,0 +1,9 @@
+
+#
+# Drop database created by the s3 tests
+#
+
+--disable_query_log
+use test;
+--eval drop database $database;
+--enable_query_log
diff --git a/mysql-test/suite/s3/my.cnf b/mysql-test/suite/s3/my.cnf
new file mode 100644
index 00000000000..1958a04343f
--- /dev/null
+++ b/mysql-test/suite/s3/my.cnf
@@ -0,0 +1,11 @@
+!include include/default_mysqld.cnf
+!include include/default_client.cnf
+
+[mysqld.1]
+s3=ON
+#s3-host-name=s3.amazonaws.com
+#s3-protocol-version=Amazon
+#s3-bucket=MariaDB
+#s3-access-key=...
+#s3-secret-key=...
+#s3-region=eu-north-1
diff --git a/mysql-test/suite/s3/no_s3-master.opt b/mysql-test/suite/s3/no_s3-master.opt
new file mode 100644
index 00000000000..ad13d335ae9
--- /dev/null
+++ b/mysql-test/suite/s3/no_s3-master.opt
@@ -0,0 +1 @@
+--s3-bucket=storage-engine --s3-access-key="" --s3-secret-key="" --s3-region=eu-north-1
diff --git a/mysql-test/suite/s3/no_s3.result b/mysql-test/suite/s3/no_s3.result
new file mode 100644
index 00000000000..89ab3ea97a1
--- /dev/null
+++ b/mysql-test/suite/s3/no_s3.result
@@ -0,0 +1,13 @@
+create table t1 (a int, b int) engine=aria select seq,seq+10 from seq_1_to_2;
+alter table t1 engine=s3;
+ERROR HY000: Can't create table `test`.`t1` (errno: 138 "Unsupported extension used for table")
+drop table t1;
+select * from s3_unique_table;
+ERROR 42000: Table 's3_unique_table' uses an extension that doesn't exist in this MariaDB version
+truncate table s3_unique_table;
+ERROR 42000: Table 's3_unique_table' uses an extension that doesn't exist in this MariaDB version
+rename table s3_unique_table to t1;
+ERROR HY000: Error on rename of './test/s3_unique_table' to './test/t1' (errno: 138 "Unsupported extension used for table")
+drop table s3_unique_table;
+Warnings:
+Warning 1112 Table 's3_unique_table' uses an extension that doesn't exist in this MariaDB version
diff --git a/mysql-test/suite/s3/no_s3.test b/mysql-test/suite/s3/no_s3.test
new file mode 100644
index 00000000000..6c5df76bfa3
--- /dev/null
+++ b/mysql-test/suite/s3/no_s3.test
@@ -0,0 +1,25 @@
+--source include/have_sequence.inc
+
+let $datadir=`select @@datadir`;
+
+if (`select @@global.s3_secret_key <> "" or @@global.s3_access_key <> ""`)
+{
+ skip S3 engine options given (probably from command line);
+}
+
+#
+# Test what happens when we don't have s3 enabled
+#
+create table t1 (a int, b int) engine=aria select seq,seq+10 from seq_1_to_2;
+--error ER_CANT_CREATE_TABLE
+alter table t1 engine=s3;
+drop table t1;
+
+--copy_file std_data/s3_unique_table.frm $datadir/test/s3_unique_table.frm
+--error ER_UNSUPPORTED_EXTENSION
+select * from s3_unique_table;
+--error ER_UNSUPPORTED_EXTENSION
+truncate table s3_unique_table;
+--error ER_ERROR_ON_RENAME
+rename table s3_unique_table to t1;
+drop table s3_unique_table;
diff --git a/mysql-test/suite/s3/select.result b/mysql-test/suite/s3/select.result
new file mode 100644
index 00000000000..94a6fdf12d6
--- /dev/null
+++ b/mysql-test/suite/s3/select.result
@@ -0,0 +1,8 @@
+create table t1 (pk int primary key, a int);
+insert into t1 values (1,1),(2,2),(3,3),(4,4);
+alter table t1 engine=S3;
+select a from t1 where pk in (2, 3);
+a
+2
+3
+drop table t1;
diff --git a/mysql-test/suite/s3/select.test b/mysql-test/suite/s3/select.test
new file mode 100644
index 00000000000..223311cb32b
--- /dev/null
+++ b/mysql-test/suite/s3/select.test
@@ -0,0 +1,17 @@
+--source include/have_s3.inc
+--source create_database.inc
+
+#
+# MDEV-19465 Server crashes in s3_block_read upon IN quer
+#
+
+create table t1 (pk int primary key, a int);
+insert into t1 values (1,1),(2,2),(3,3),(4,4);
+alter table t1 engine=S3;
+select a from t1 where pk in (2, 3);
+drop table t1;
+
+#
+# clean up
+#
+--source drop_database.inc
diff --git a/mysql-test/suite/s3/suite.pm b/mysql-test/suite/s3/suite.pm
new file mode 100644
index 00000000000..5bf1559ae97
--- /dev/null
+++ b/mysql-test/suite/s3/suite.pm
@@ -0,0 +1,8 @@
+package My::Suite::S3;
+
+@ISA = qw(My::Suite);
+
+return "Need S3 engine" unless $::mysqld_variables{'s3'} eq "ON";
+
+bless { };
+
diff --git a/mysql-test/suite/s3/unsupported.result b/mysql-test/suite/s3/unsupported.result
new file mode 100644
index 00000000000..4ced713f73f
--- /dev/null
+++ b/mysql-test/suite/s3/unsupported.result
@@ -0,0 +1,8 @@
+create sequence s1;
+alter table s1 engine=s3;
+ERROR HY000: Can't create table `database`.`s1` (errno: 138 "Unsupported extension used for table")
+drop sequence s1;
+create temporary table t1 (a int);
+alter table t1 engine=S3;
+ERROR HY000: Can't create table `database`.`t1` (errno: 131 "Command not supported by the engine")
+drop temporary table t1;
diff --git a/mysql-test/suite/s3/unsupported.test b/mysql-test/suite/s3/unsupported.test
new file mode 100644
index 00000000000..c2b2a89e424
--- /dev/null
+++ b/mysql-test/suite/s3/unsupported.test
@@ -0,0 +1,31 @@
+--source include/have_s3.inc
+--source create_database.inc
+
+#
+# Test unsupported features in S3
+#
+#
+
+#
+# MDEV-19463 Altering sequence to S3 leaves unremovable garbage behind
+#
+
+create sequence s1;
+--replace_result $database database
+--error ER_CANT_CREATE_TABLE
+alter table s1 engine=s3;
+drop sequence s1;
+
+#
+# MDEV-19461 Assertion failure upon altering temporary S3 table
+#
+
+create temporary table t1 (a int);
+--replace_result $database database
+--error ER_CANT_CREATE_TABLE
+alter table t1 engine=S3;
+drop temporary table t1;
+
+# clean up
+#
+--source drop_database.inc
diff --git a/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result b/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result
index eec16411144..91d3c65597a 100644
--- a/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result
@@ -1,7 +1,7 @@
SET @orig = @@global.innodb_checksum_algorithm;
SELECT @orig;
@orig
-crc32
+full_crc32
SET GLOBAL innodb_checksum_algorithm = 'crc32';
SELECT @@global.innodb_checksum_algorithm;
@@global.innodb_checksum_algorithm
@@ -52,4 +52,4 @@ strict_full_crc32
SET GLOBAL innodb_checksum_algorithm = @orig;
SELECT @@global.innodb_checksum_algorithm;
@@global.innodb_checksum_algorithm
-crc32
+full_crc32
diff --git a/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result b/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
deleted file mode 100644
index bb3cbac1863..00000000000
--- a/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result
+++ /dev/null
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_023_01----------------------#'
-SELECT COUNT(@@GLOBAL.innodb_checksums);
-COUNT(@@GLOBAL.innodb_checksums)
-1
-1 Expected
-'#---------------------BS_STVARS_023_02----------------------#'
-SET @@GLOBAL.innodb_checksums=1;
-ERROR HY000: Variable 'innodb_checksums' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.innodb_checksums);
-COUNT(@@GLOBAL.innodb_checksums)
-1
-1 Expected
-'#---------------------BS_STVARS_023_03----------------------#'
-SELECT IF(@@GLOBAL.innodb_checksums, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_checksums';
-IF(@@GLOBAL.innodb_checksums, "ON", "OFF") = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.innodb_checksums);
-COUNT(@@GLOBAL.innodb_checksums)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_checksums';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_023_04----------------------#'
-SELECT @@innodb_checksums = @@GLOBAL.innodb_checksums;
-@@innodb_checksums = @@GLOBAL.innodb_checksums
-1
-1 Expected
-'#---------------------BS_STVARS_023_05----------------------#'
-SELECT COUNT(@@innodb_checksums);
-COUNT(@@innodb_checksums)
-1
-1 Expected
-SELECT COUNT(@@local.innodb_checksums);
-ERROR HY000: Variable 'innodb_checksums' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.innodb_checksums);
-ERROR HY000: Variable 'innodb_checksums' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.innodb_checksums);
-COUNT(@@GLOBAL.innodb_checksums)
-1
-1 Expected
-SELECT innodb_checksums = @@SESSION.innodb_checksums;
-ERROR 42S22: Unknown column 'innodb_checksums' in 'field list'
-Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result b/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
deleted file mode 100644
index c2229d54d02..00000000000
--- a/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result
+++ /dev/null
@@ -1,53 +0,0 @@
-'#---------------------BS_STVARS_031_01----------------------#'
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
-COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog)
-1
-1 Expected
-'#---------------------BS_STVARS_031_02----------------------#'
-SET @@GLOBAL.innodb_locks_unsafe_for_binlog=1;
-ERROR HY000: Variable 'innodb_locks_unsafe_for_binlog' is a read only variable
-Expected error 'Read only variable'
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
-COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog)
-1
-1 Expected
-'#---------------------BS_STVARS_031_03----------------------#'
-SELECT IF(@@GLOBAL.innodb_locks_unsafe_for_binlog, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_locks_unsafe_for_binlog';
-IF(@@GLOBAL.innodb_locks_unsafe_for_binlog, "ON", "OFF") = VARIABLE_VALUE
-1
-1 Expected
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
-COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog)
-1
-1 Expected
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_locks_unsafe_for_binlog';
-COUNT(VARIABLE_VALUE)
-1
-1 Expected
-'#---------------------BS_STVARS_031_04----------------------#'
-SELECT @@innodb_locks_unsafe_for_binlog = @@GLOBAL.innodb_locks_unsafe_for_binlog;
-@@innodb_locks_unsafe_for_binlog = @@GLOBAL.innodb_locks_unsafe_for_binlog
-1
-1 Expected
-'#---------------------BS_STVARS_031_05----------------------#'
-SELECT COUNT(@@innodb_locks_unsafe_for_binlog);
-COUNT(@@innodb_locks_unsafe_for_binlog)
-1
-1 Expected
-SELECT COUNT(@@local.innodb_locks_unsafe_for_binlog);
-ERROR HY000: Variable 'innodb_locks_unsafe_for_binlog' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.innodb_locks_unsafe_for_binlog);
-ERROR HY000: Variable 'innodb_locks_unsafe_for_binlog' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
-COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog)
-1
-1 Expected
-SELECT innodb_locks_unsafe_for_binlog = @@SESSION.innodb_locks_unsafe_for_binlog;
-ERROR 42S22: Unknown column 'innodb_locks_unsafe_for_binlog' in 'field list'
-Expected error 'Readonly variable'
diff --git a/mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result
index 6679ca87249..bf70bbb1bea 100644
--- a/mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_checksums_basic.result
@@ -28,15 +28,23 @@ SELECT @@global.innodb_log_checksums;
@@global.innodb_log_checksums
1
SET GLOBAL innodb_log_checksums = OFF;
+Warnings:
+Warning 138 The parameter innodb_log_checksums is deprecated and has no effect.
SELECT @@global.innodb_log_checksums;
@@global.innodb_log_checksums
-0
+1
SET GLOBAL innodb_log_checksums = default;
+Warnings:
+Warning 138 The parameter innodb_log_checksums is deprecated and has no effect.
SET GLOBAL innodb_log_checksums = ON;
+Warnings:
+Warning 138 The parameter innodb_log_checksums is deprecated and has no effect.
SELECT @@global.innodb_log_checksums;
@@global.innodb_log_checksums
1
SET GLOBAL innodb_log_checksums = @orig;
+Warnings:
+Warning 138 The parameter innodb_log_checksums is deprecated and has no effect.
SELECT @@global.innodb_log_checksums;
@@global.innodb_log_checksums
1
diff --git a/mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result b/mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result
deleted file mode 100644
index a8d392eee38..00000000000
--- a/mysql-test/suite/sys_vars/r/innodb_rollback_segments_basic.result
+++ /dev/null
@@ -1,64 +0,0 @@
-SET @start_global_value = @@global.innodb_rollback_segments;
-SELECT @start_global_value;
-@start_global_value
-128
-Valid values are zero or above
-SELECT @@global.innodb_rollback_segments >=0;
-@@global.innodb_rollback_segments >=0
-1
-SELECT @@global.innodb_rollback_segments <=128;
-@@global.innodb_rollback_segments <=128
-1
-SELECT @@global.innodb_rollback_segments;
-@@global.innodb_rollback_segments
-128
-SELECT @@session.innodb_rollback_segments;
-ERROR HY000: Variable 'innodb_rollback_segments' is a GLOBAL variable
-SHOW global variables LIKE 'innodb_rollback_segments';
-Variable_name Value
-innodb_rollback_segments 128
-SHOW session variables LIKE 'innodb_rollback_segments';
-Variable_name Value
-innodb_rollback_segments 128
-SELECT * FROM information_schema.global_variables
-WHERE variable_name='innodb_rollback_segments';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_ROLLBACK_SEGMENTS 128
-SELECT * FROM information_schema.session_variables
-WHERE variable_name='innodb_rollback_segments';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_ROLLBACK_SEGMENTS 128
-SET global innodb_rollback_segments=100;
-SELECT @@global.innodb_rollback_segments;
-@@global.innodb_rollback_segments
-100
-SELECT * FROM information_schema.global_variables
-WHERE variable_name='innodb_rollback_segments';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_ROLLBACK_SEGMENTS 100
-SELECT * FROM information_schema.session_variables
-WHERE variable_name='innodb_rollback_segments';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_ROLLBACK_SEGMENTS 100
-SET session innodb_rollback_segments=1;
-ERROR HY000: Variable 'innodb_rollback_segments' is a GLOBAL variable and should be set with SET GLOBAL
-SET global innodb_rollback_segments=1.1;
-ERROR 42000: Incorrect argument type to variable 'innodb_rollback_segments'
-SET global innodb_rollback_segments=1e1;
-ERROR 42000: Incorrect argument type to variable 'innodb_rollback_segments'
-SET global innodb_rollback_segments="foo";
-ERROR 42000: Incorrect argument type to variable 'innodb_rollback_segments'
-SET global innodb_rollback_segments=-7;
-Warnings:
-Warning 1292 Truncated incorrect innodb_rollback_segments value: '-7'
-SELECT @@global.innodb_rollback_segments;
-@@global.innodb_rollback_segments
-1
-SELECT * FROM information_schema.global_variables
-WHERE variable_name='innodb_rollback_segments';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_ROLLBACK_SEGMENTS 1
-SET @@global.innodb_rollback_segments = @start_global_value;
-SELECT @@global.innodb_rollback_segments;
-@@global.innodb_rollback_segments
-128
diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
deleted file mode 100644
index 8618d602922..00000000000
--- a/mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
+++ /dev/null
@@ -1,77 +0,0 @@
-SET @start_global_value = @@global.innodb_stats_sample_pages;
-SELECT @start_global_value;
-@start_global_value
-8
-Valid values are one or above
-select @@global.innodb_stats_sample_pages >=1;
-@@global.innodb_stats_sample_pages >=1
-1
-select @@global.innodb_stats_sample_pages;
-@@global.innodb_stats_sample_pages
-8
-select @@session.innodb_stats_sample_pages;
-ERROR HY000: Variable 'innodb_stats_sample_pages' is a GLOBAL variable
-show global variables like 'innodb_stats_sample_pages';
-Variable_name Value
-innodb_stats_sample_pages 8
-show session variables like 'innodb_stats_sample_pages';
-Variable_name Value
-innodb_stats_sample_pages 8
-select * from information_schema.global_variables where variable_name='innodb_stats_sample_pages';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_STATS_SAMPLE_PAGES 8
-select * from information_schema.session_variables where variable_name='innodb_stats_sample_pages';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_STATS_SAMPLE_PAGES 8
-set global innodb_stats_sample_pages=10;
-Warnings:
-Warning 131 Using innodb_stats_sample_pages is deprecated and the variable may be removed in future releases. Please use innodb_stats_transient_sample_pages instead.
-select @@global.innodb_stats_sample_pages;
-@@global.innodb_stats_sample_pages
-10
-select * from information_schema.global_variables where variable_name='innodb_stats_sample_pages';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_STATS_SAMPLE_PAGES 10
-select * from information_schema.session_variables where variable_name='innodb_stats_sample_pages';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_STATS_SAMPLE_PAGES 10
-set session innodb_stats_sample_pages=1;
-ERROR HY000: Variable 'innodb_stats_sample_pages' is a GLOBAL variable and should be set with SET GLOBAL
-set global innodb_stats_sample_pages=DEFAULT;
-Warnings:
-Warning 131 Using innodb_stats_sample_pages is deprecated and the variable may be removed in future releases. Please use innodb_stats_transient_sample_pages instead.
-select @@global.innodb_stats_sample_pages;
-@@global.innodb_stats_sample_pages
-8
-set global innodb_stats_sample_pages = 1.1;
-ERROR 42000: Incorrect argument type to variable 'innodb_stats_sample_pages'
-set global innodb_stats_sample_pages = 1e1;
-ERROR 42000: Incorrect argument type to variable 'innodb_stats_sample_pages'
-set global innodb_stats_sample_pages = "foo";
-ERROR 42000: Incorrect argument type to variable 'innodb_stats_sample_pages'
-set global innodb_stats_sample_pages=' ';
-ERROR 42000: Incorrect argument type to variable 'innodb_stats_sample_pages'
-select @@global.innodb_stats_sample_pages;
-@@global.innodb_stats_sample_pages
-8
-set global innodb_stats_sample_pages=" ";
-ERROR 42000: Incorrect argument type to variable 'innodb_stats_sample_pages'
-select @@global.innodb_stats_sample_pages;
-@@global.innodb_stats_sample_pages
-8
-set global innodb_stats_sample_pages=-7;
-Warnings:
-Warning 1292 Truncated incorrect innodb_stats_sample_pages value: '-7'
-Warning 131 Using innodb_stats_sample_pages is deprecated and the variable may be removed in future releases. Please use innodb_stats_transient_sample_pages instead.
-select @@global.innodb_stats_sample_pages;
-@@global.innodb_stats_sample_pages
-1
-select * from information_schema.global_variables where variable_name='innodb_stats_sample_pages';
-VARIABLE_NAME VARIABLE_VALUE
-INNODB_STATS_SAMPLE_PAGES 1
-SET @@global.innodb_stats_sample_pages = @start_global_value;
-Warnings:
-Warning 131 Using innodb_stats_sample_pages is deprecated and the variable may be removed in future releases. Please use innodb_stats_transient_sample_pages instead.
-SELECT @@global.innodb_stats_sample_pages;
-@@global.innodb_stats_sample_pages
-8
diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result
index 1ea5ac3d3bc..abd6beec929 100644
--- a/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result
@@ -2,9 +2,9 @@ SET @start_global_value = @@global.innodb_stats_transient_sample_pages;
SELECT @start_global_value;
@start_global_value
8
-Valid values are zero or above
-SELECT @@global.innodb_stats_transient_sample_pages >=0;
-@@global.innodb_stats_transient_sample_pages >=0
+Valid values are one or above
+SELECT @@global.innodb_stats_transient_sample_pages >=1;
+@@global.innodb_stats_transient_sample_pages >=1
1
SELECT @@global.innodb_stats_transient_sample_pages;
@@global.innodb_stats_transient_sample_pages
diff --git a/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result b/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result
index 1310d7151fd..d6ff67ccc7d 100644
--- a/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result
@@ -1,68 +1,44 @@
-SELECT @@GLOBAL.innodb_undo_logs;
-@@GLOBAL.innodb_undo_logs
+SELECT @@global.innodb_undo_logs;
+@@global.innodb_undo_logs
128
-128 Expected
-SET @@GLOBAL.innodb_undo_logs=128;
-SELECT COUNT(@@GLOBAL.innodb_undo_logs);
-COUNT(@@GLOBAL.innodb_undo_logs)
-1
-1 Expected
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_undo_logs';
-VARIABLE_VALUE
-128
-128 Expected
-SELECT @@innodb_undo_logs = @@GLOBAL.innodb_undo_logs;
-@@innodb_undo_logs = @@GLOBAL.innodb_undo_logs
-1
-1 Expected
-SELECT COUNT(@@innodb_undo_logs);
-COUNT(@@innodb_undo_logs)
-1
-1 Expected
-SELECT COUNT(@@local.innodb_undo_logs);
-ERROR HY000: Variable 'innodb_undo_logs' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT COUNT(@@SESSION.innodb_undo_logs);
+SELECT @@session.innodb_undo_logs;
ERROR HY000: Variable 'innodb_undo_logs' is a GLOBAL variable
-Expected error 'Variable is a GLOBAL variable'
-SELECT innodb_undo_logs = @@SESSION.innodb_undo_logs;
-ERROR 42S22: Unknown column 'innodb_undo_logs' in 'field list'
-Begin bug 13604034
-select @@innodb_undo_logs;
-@@innodb_undo_logs
-128
-128 Expected
-set global innodb_undo_logs = 129;
+SHOW global variables LIKE 'innodb_undo_logs';
+Variable_name Value
+innodb_undo_logs 128
+SHOW session variables LIKE 'innodb_undo_logs';
+Variable_name Value
+innodb_undo_logs 128
+SELECT * FROM information_schema.global_variables
+WHERE variable_name='innodb_undo_logs';
+VARIABLE_NAME VARIABLE_VALUE
+INNODB_UNDO_LOGS 128
+SELECT * FROM information_schema.session_variables
+WHERE variable_name='innodb_undo_logs';
+VARIABLE_NAME VARIABLE_VALUE
+INNODB_UNDO_LOGS 128
+SET global innodb_undo_logs=100;
Warnings:
-Warning 1292 Truncated incorrect innodb_undo_logs value: '129'
-select @@innodb_undo_logs;
-@@innodb_undo_logs
+Warning 138 The parameter innodb_undo_logs is deprecated and has no effect.
+SELECT @@global.innodb_undo_logs;
+@@global.innodb_undo_logs
128
-128 Expected
-set global innodb_undo_logs = 0;
-Warnings:
-Warning 1292 Truncated incorrect innodb_undo_logs value: '0'
-select @@innodb_undo_logs;
-@@innodb_undo_logs
-1
-1 Expected
-set global innodb_undo_logs = -1;
+SET session innodb_undo_logs=1;
+ERROR HY000: Variable 'innodb_undo_logs' is a GLOBAL variable and should be set with SET GLOBAL
+SET global innodb_undo_logs=1.1;
+ERROR 42000: Incorrect argument type to variable 'innodb_undo_logs'
+SET global innodb_undo_logs=1e1;
+ERROR 42000: Incorrect argument type to variable 'innodb_undo_logs'
+SET global innodb_undo_logs="foo";
+ERROR 42000: Incorrect argument type to variable 'innodb_undo_logs'
+SET global innodb_undo_logs=-7;
Warnings:
-Warning 1292 Truncated incorrect innodb_undo_logs value: '-1'
-select @@innodb_undo_logs;
-@@innodb_undo_logs
-1
-1 Expected
-set global innodb_undo_logs = 50;
-select @@innodb_undo_logs;
-@@innodb_undo_logs
-50
-50 Expected
-set global innodb_undo_logs = default;
-select @@innodb_undo_logs;
-@@innodb_undo_logs
+Warning 1292 Truncated incorrect innodb_undo_logs value: '-7'
+Warning 138 The parameter innodb_undo_logs is deprecated and has no effect.
+SELECT @@global.innodb_undo_logs;
+@@global.innodb_undo_logs
128
-128 Expected
-End bug 13604034
+SELECT * FROM information_schema.global_variables
+WHERE variable_name='innodb_undo_logs';
+VARIABLE_NAME VARIABLE_VALUE
+INNODB_UNDO_LOGS 128
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled
deleted file mode 100644
index 794e93a108b..00000000000
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled
+++ /dev/null
@@ -1,1236 +0,0 @@
---- suite/sys_vars/r/sysvars_innodb.result
-+++ suite/sys_vars/r/sysvars_innodb,32bit.reject
-@@ -47,13 +47,27 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)
-+NUMERIC_MIN_VALUE 1
-+NUMERIC_MAX_VALUE 32
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_ADAPTIVE_MAX_SLEEP_DELAY
- SESSION_VALUE NULL
- GLOBAL_VALUE 150000
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 150000
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT The upper limit of the sleep delay in usec. Value of 0 disables it.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 1000000
-@@ -67,10 +81,10 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 8388608
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT
-+VARIABLE_TYPE INT
- VARIABLE_COMMENT DEPRECATED. This option may be removed in future releases, together with the option innodb_use_sys_malloc and with the InnoDB's internal memory allocator. Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.
- NUMERIC_MIN_VALUE 524288
--NUMERIC_MAX_VALUE 9223372036854775807
-+NUMERIC_MAX_VALUE 2147483647
- NUMERIC_BLOCK_SIZE 1024
- ENUM_VALUE_LIST NULL
- READ_ONLY YES
-@@ -81,7 +95,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 5
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Background commit interval in seconds
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 1073741824
-@@ -137,7 +151,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT InnoDB API transaction isolation level
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 3
-@@ -151,7 +165,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 64
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Data file autoextend increment in megabytes
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 1000
-@@ -165,7 +179,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT
-+VARIABLE_TYPE INT
- VARIABLE_COMMENT The AUTOINC lock modes supported by InnoDB: 0 => Old style AUTOINC locking (for backward compatibility) 1 => New style AUTOINC locking 2 => No AUTOINC locking (unsafe for SBR)
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 2
-@@ -263,7 +277,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 100
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Dump only the hottest N% of each buffer pool, defaults to 100
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 100
-@@ -305,7 +319,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT
-+VARIABLE_TYPE INT
- VARIABLE_COMMENT Number of buffer pool instances, set to higher value on high-end machines to increase scalability
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 64
-@@ -355,6 +369,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_BUFFER_POOL_POPULATE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Deprecated. This option has no effect and will be removed in MariaDB 10.2.3.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_BUFFER_POOL_SIZE
- SESSION_VALUE NULL
- GLOBAL_VALUE 8388608
-@@ -375,7 +403,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed).
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 100
-@@ -446,7 +474,7 @@
- DEFAULT_VALUE ON
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE BOOLEAN
--VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF. Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums.
-+VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
-@@ -467,6 +495,104 @@
- ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_EVICTION_FACTOR
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make page cleaner LRU flushes use evicted instead of flushed page counts for its heuristics
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_CLEANER_FLUSH_CHUNK_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 100
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 100
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Divide page cleaner flush list flush batches into chunks of this size
-+NUMERIC_MIN_VALUE 1
-+NUMERIC_MAX_VALUE 4294967295
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_FREE_LIST_LWM
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 10
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 10
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Page cleaner will keep on flushing the same buffer pool instance if its free list length is below this percentage of innodb_lru_scan_depth
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 100
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_LRU_CHUNK_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 100
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 100
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Divide page cleaner LRU list flush batches into chunks of this size
-+NUMERIC_MIN_VALUE 1
-+NUMERIC_MAX_VALUE 4294967295
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_LSN_AGE_FACTOR
-+SESSION_VALUE NULL
-+GLOBAL_VALUE HIGH_CHECKPOINT
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE HIGH_CHECKPOINT
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The formula for LSN age factor for page cleaner adaptive flushing. LEGACY: Original Oracle MySQL 5.6 formula. HIGH_CHECKPOINT: (the default) Percona Server 5.6 formula.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST LEGACY,HIGH_CHECKPOINT
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_CLEANER_MAX_FLUSH_TIME
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1000
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1000
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT The maximum time limit for a single flush list flush iteration by the page cleaner thread in miliseconds
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 4294967295
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_MAX_LRU_TIME
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1000
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1000
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT The maximum time limit for a single LRU tail flush iteration by the page cleaner thread in miliseconds
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 4294967295
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_CMP_PER_INDEX_ENABLED
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -487,7 +613,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Helps in performance tuning in heavily concurrent environments.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 1000
-@@ -515,7 +641,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 5
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT If the compression failure rate of a table is greater than this number more padding is added to the pages to reduce the failures. A value of zero implies no padding
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 100
-@@ -543,7 +669,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 50
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Percentage of empty space on a data page that can be reserved to make the page compressible.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 75
-@@ -557,14 +683,28 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 5000
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket
- NUMERIC_MIN_VALUE 1
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CORRUPT_TABLE_ACTION
-+SESSION_VALUE NULL
-+GLOBAL_VALUE assert
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE assert
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT Warn corruptions of user tables as 'corrupt table' instead of not crashing itself, when used with file_per_table. All file io for the datafile after detected as corrupt are disabled, except for the deletion.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST assert,warn,salvage
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_DATA_FILE_PATH
- SESSION_VALUE NULL
- GLOBAL_VALUE ibdata1:12M:autoextend
-@@ -781,7 +921,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 120
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of pages reserved in doublewrite buffer for batch flushing
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 127
-@@ -789,6 +929,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_EMPTY_FREE_LIST_ALGORITHM
-+SESSION_VALUE NULL
-+GLOBAL_VALUE LEGACY
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE BACKOFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The algorithm to use for empty free list handling. Allowed values: LEGACY: Original Oracle MySQL 5.6 handling with single page flushes; BACKOFF: (default) Wait until cleaner produces a free page.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST LEGACY,BACKOFF
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_ENCRYPTION_ROTATE_KEY_AGE
- SESSION_VALUE NULL
- GLOBAL_VALUE 1
-@@ -859,13 +1013,27 @@
- ENUM_VALUE_LIST OFF,ON,FORCE
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_FAKE_CHANGES
-+SESSION_VALUE OFF
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE SESSION
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_FAST_SHUTDOWN
- SESSION_VALUE NULL
- GLOBAL_VALUE 1
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like).
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 2
-@@ -879,7 +1047,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 600
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 4294967295
-@@ -949,7 +1117,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Make the first page of the given tablespace dirty.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 4294967295
-@@ -963,7 +1131,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 30
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of iterations over which the background flushing is averaged.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 1000
-@@ -986,12 +1154,12 @@
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT
--SESSION_VALUE NULL
-+SESSION_VALUE 1
- GLOBAL_VALUE 1
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1
--VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_SCOPE SESSION
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 3
-@@ -1019,7 +1187,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 2
-@@ -1061,7 +1229,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Helps to save your data in case the disk image of the database becomes corrupt.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 6
-@@ -1069,6 +1237,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_FOREGROUND_PREFLUSH
-+SESSION_VALUE NULL
-+GLOBAL_VALUE EXPONENTIAL_BACKOFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE EXPONENTIAL_BACKOFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The algorithm InnoDB uses for the query threads at sync preflush. Possible values are SYNC_PREFLUSH: perform a sync preflush as Oracle MySQL; EXPONENTIAL_BACKOFF: (default) wait for the page cleaner flush.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST SYNC_PREFLUSH,EXPONENTIAL_BACKOFF
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_FT_AUX_TABLE
- SESSION_VALUE NULL
- GLOBAL_VALUE
-@@ -1089,7 +1271,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 8000000
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT InnoDB Fulltext search cache size in bytes
- NUMERIC_MIN_VALUE 1600000
- NUMERIC_MAX_VALUE 80000000
-@@ -1131,7 +1313,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 84
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT InnoDB Fulltext search maximum token size in characters
- NUMERIC_MIN_VALUE 10
- NUMERIC_MAX_VALUE 84
-@@ -1145,7 +1327,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 3
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT InnoDB Fulltext search minimum token size in characters
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 16
-@@ -1159,7 +1341,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 2000
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call
- NUMERIC_MIN_VALUE 1000
- NUMERIC_MAX_VALUE 10000
-@@ -1173,10 +1355,10 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 2000000000
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT InnoDB Fulltext search query result cache limit in bytes
- NUMERIC_MIN_VALUE 1000000
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
-@@ -1201,7 +1383,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 2
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 16
-@@ -1215,7 +1397,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 640000000
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Total memory allocated for InnoDB Fulltext Search cache
- NUMERIC_MIN_VALUE 32000000
- NUMERIC_MAX_VALUE 1600000000
-@@ -1243,7 +1425,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 100
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 100
-@@ -1285,10 +1467,10 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 200
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of IOPs the server can do. Tunes the background IO rate
- NUMERIC_MIN_VALUE 100
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
-@@ -1297,12 +1479,26 @@
- SESSION_VALUE NULL
- GLOBAL_VALUE 2000
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
--DEFAULT_VALUE 18446744073709551615
-+DEFAULT_VALUE 4294967295
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Limit to which innodb_io_capacity can be inflated.
- NUMERIC_MIN_VALUE 100
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_KILL_IDLE_TRANSACTION
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 0
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 0
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT
-+VARIABLE_COMMENT No effect for this build.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 2147483647
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
-@@ -1335,6 +1531,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_LOCKING_FAKE_CHANGES
-+SESSION_VALUE NULL
-+GLOBAL_VALUE ON
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE ON
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT ###EXPERIMENTAL### if enabled, transactions will get S row locks instead of X locks for fake changes. If disabled, fake change transactions will not take any locks at all.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_LOCKS_UNSAFE_FOR_BINLOG
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -1369,7 +1579,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 50
- VARIABLE_SCOPE SESSION
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 1073741824
-@@ -1377,16 +1587,72 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_LOG_ARCHIVE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Set to 1 if you want to have logs archived.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_LOG_ARCH_DIR
-+SESSION_VALUE NULL
-+GLOBAL_VALUE PATH
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE VARCHAR
-+VARIABLE_COMMENT Where full logs should be archived.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST NULL
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_LOG_ARCH_EXPIRE_SEC
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 0
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 0
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Expiration time for archived innodb transaction logs.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 4294967295
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_LOG_BLOCK_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 512
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 512
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT ###EXPERIMENTAL###: The log block size of the transaction log file. Changing for created log file is not supported. Use on your own risk!
-+NUMERIC_MIN_VALUE 512
-+NUMERIC_MAX_VALUE 65536
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_LOG_BUFFER_SIZE
- SESSION_VALUE NULL
- GLOBAL_VALUE 1048576
- GLOBAL_VALUE_ORIGIN CONFIG
- DEFAULT_VALUE 16777216
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT
-+VARIABLE_TYPE INT
- VARIABLE_COMMENT The size of the buffer which InnoDB uses to write log to the log files on disk.
- NUMERIC_MIN_VALUE 262144
--NUMERIC_MAX_VALUE 9223372036854775807
-+NUMERIC_MAX_VALUE 2147483647
- NUMERIC_BLOCK_SIZE 1024
- ENUM_VALUE_LIST NULL
- READ_ONLY YES
-@@ -1405,6 +1671,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_LOG_CHECKSUM_ALGORITHM
-+SESSION_VALUE NULL
-+GLOBAL_VALUE INNODB
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE INNODB
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The algorithm InnoDB uses for log block checksums. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Logs created when this option is set to crc32/strict_crc32/none/strict_none will not be readable by any MySQL version or Percona Server versions that donot support this feature
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES
- SESSION_VALUE NULL
- GLOBAL_VALUE ON
-@@ -1425,7 +1705,7 @@
- GLOBAL_VALUE_ORIGIN CONFIG
- DEFAULT_VALUE 2
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of log files in the log group. InnoDB writes to the files in a circular fashion.
- NUMERIC_MIN_VALUE 2
- NUMERIC_MAX_VALUE 100
-@@ -1467,9 +1747,37 @@
- GLOBAL_VALUE_ORIGIN CONFIG
- DEFAULT_VALUE 1024
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT How deep to scan LRU to keep it clean
- NUMERIC_MIN_VALUE 100
-+NUMERIC_MAX_VALUE 4294967295
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_MAX_BITMAP_FILE_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 104857600
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 104857600
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT The maximum size of changed page bitmap files
-+NUMERIC_MIN_VALUE 4096
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_MAX_CHANGED_PAGES
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1000000
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1000000
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT The maximum number of rows for INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, 0 - unlimited
-+NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 18446744073709551615
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
-@@ -1509,10 +1817,10 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Desired maximum length of the purge queue (0 = no limit)
- NUMERIC_MIN_VALUE 0
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
-@@ -1523,7 +1831,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Maximum delay of user threads in micro-seconds
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 10000000
-@@ -1537,7 +1845,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT
-+VARIABLE_TYPE INT
- VARIABLE_COMMENT Number of identical copies of log groups we keep for the database. Currently this should be set to 1.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 10
-@@ -1607,7 +1915,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 8
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT
-+VARIABLE_TYPE INT
- VARIABLE_COMMENT Number of multi-threaded flush threads
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 64
-@@ -1659,14 +1967,14 @@
- COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_OPEN_FILES
- SESSION_VALUE NULL
--GLOBAL_VALUE 2000
-+GLOBAL_VALUE 300
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT
-+VARIABLE_TYPE INT
- VARIABLE_COMMENT How many files at the maximum InnoDB keeps open at the same time.
- NUMERIC_MIN_VALUE 0
--NUMERIC_MAX_VALUE 9223372036854775807
-+NUMERIC_MAX_VALUE 2147483647
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY YES
-@@ -1691,7 +1999,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 16
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 1024
-@@ -1705,7 +2013,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 16384
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Page size to use for all InnoDB tablespaces.
- NUMERIC_MIN_VALUE 4096
- NUMERIC_MAX_VALUE 65536
-@@ -1741,13 +2049,83 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRINT_LOCK_WAIT_TIMEOUT_INFO
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Print lock wait timeout info to MySQL error log (off by default)
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_CLEANER
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make buffer pool cleaner and LRU manager threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_IO
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make I/O threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_MASTER
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make buffer pool cleaner thread acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_PURGE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make purge coordinator and worker threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_PURGE_BATCH_SIZE
- SESSION_VALUE NULL
- GLOBAL_VALUE 300
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 300
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 5000
-@@ -1789,7 +2167,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Purge threads can be from 1 to 32. Default is 1.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 32
-@@ -1817,7 +2195,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 56
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 64
-@@ -1831,7 +2209,7 @@
- GLOBAL_VALUE_ORIGIN CONFIG
- DEFAULT_VALUE 4
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of background read I/O threads in InnoDB.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 64
-@@ -1859,10 +2237,10 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Replication thread delay (ms) on the slave server if innodb_thread_concurrency is reached (0 by default)
- NUMERIC_MIN_VALUE 0
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
-@@ -1887,7 +2265,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 128
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of undo logs to use (deprecated).
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 128
-@@ -1901,7 +2279,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT An InnoDB page number.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 4294967295
-@@ -1909,6 +2287,48 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_SCHED_PRIORITY_IO
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 19
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 19
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Nice value for the I/O handler thread scheduling
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 39
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_SCHED_PRIORITY_MASTER
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 19
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 19
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Nice value for the master thread scheduling
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 39
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_SCHED_PRIORITY_PURGE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 19
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 19
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Nice value for the purge thread scheduling
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 39
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_SCRUB_LOG
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -1937,6 +2357,34 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_SHOW_LOCKS_HELD
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 10
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 10
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Number of locks held to print for each InnoDB transaction in SHOW INNODB STATUS.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 1000
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_SHOW_VERBOSE_LOCKS
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 0
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 0
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE INT UNSIGNED
-+VARIABLE_COMMENT Whether to show records locked in SHOW INNODB STATUS.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 1
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_SIMULATE_COMP_FAILURES
- SESSION_VALUE NULL
- GLOBAL_VALUE 0
-@@ -1957,7 +2405,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1048576
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Memory buffer size for index creation
- NUMERIC_MIN_VALUE 65536
- NUMERIC_MAX_VALUE 67108864
-@@ -1971,10 +2419,10 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 6
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Maximum delay between polling for a spin lock (6 by default)
- NUMERIC_MIN_VALUE 0
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
-@@ -2014,7 +2462,7 @@
- DEFAULT_VALUE nulls_equal
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE ENUM
--VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs. Possible values are NULLS_EQUAL (default), NULLS_UNEQUAL and NULLS_IGNORED
-+VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
-@@ -2181,7 +2629,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Size of the mutex/lock wait array.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 1024
-@@ -2195,10 +2643,10 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 30
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Count of spin-loop rounds in InnoDB mutexes (30 by default)
- NUMERIC_MIN_VALUE 0
--NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_MAX_VALUE 4294967295
- NUMERIC_BLOCK_SIZE 0
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
-@@ -2223,7 +2671,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 1000
-@@ -2237,7 +2685,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 10000
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 1000000
-@@ -2259,6 +2707,34 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_TRACK_CHANGED_PAGES
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Track the redo log for changed pages and output a changed page bitmap
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT NONE
-+VARIABLE_NAME INNODB_TRACK_REDO_LOG_NOW
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Force log tracker to catch up with checkpoint now
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -2307,7 +2783,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 128
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of undo logs to use.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 128
-@@ -2321,7 +2797,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of undo tablespaces to use.
- NUMERIC_MIN_VALUE 0
- NUMERIC_MAX_VALUE 126
-@@ -2336,7 +2812,7 @@
- DEFAULT_VALUE OFF
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE BOOLEAN
--VARIABLE_COMMENT Prevent partial page writes, via atomic writes.The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer.Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
-+VARIABLE_COMMENT Prevent partial page writes, via atomic writes (beta). The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer. Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
-@@ -2357,6 +2833,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT NONE
-+VARIABLE_NAME INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
-+SESSION_VALUE NULL
-+GLOBAL_VALUE ON
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE ON
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Use global innodb_flush_log_at_trx_commit value. (default: ON).
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_USE_MTFLUSH
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -2371,6 +2861,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT NONE
-+VARIABLE_NAME INNODB_USE_STACKTRACE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Print stacktrace on long semaphore wait (off by default supported only on linux)
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_USE_SYS_MALLOC
- SESSION_VALUE NULL
- GLOBAL_VALUE ON
-@@ -2401,12 +2905,12 @@
- COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_VERSION
- SESSION_VALUE NULL
--GLOBAL_VALUE 5.6.44
-+GLOBAL_VALUE 5.6.43-84.3
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE NULL
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE VARCHAR
--VARIABLE_COMMENT InnoDB version
-+VARIABLE_COMMENT Percona-InnoDB-plugin version
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
-@@ -2419,7 +2923,7 @@
- GLOBAL_VALUE_ORIGIN CONFIG
- DEFAULT_VALUE 4
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of background write I/O threads in InnoDB.
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 64
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
index 2f5fb044f1b..2d299817d53 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
@@ -457,15 +457,6 @@
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
-@@ -1932,7 +1932,7 @@
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 128
- VARIABLE_SCOPE GLOBAL
--VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of undo logs to use (deprecated).
- NUMERIC_MIN_VALUE 1
- NUMERIC_MAX_VALUE 128
@@ -1946,7 +1946,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0
@@ -530,7 +521,7 @@
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
- VARIABLE_COMMENT Number of undo logs to use.
+ VARIABLE_COMMENT Deprecated parameter with no effect.
NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 128
@@ -2394,7 +2394,7 @@
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled
deleted file mode 100644
index 195eda13c52..00000000000
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled
+++ /dev/null
@@ -1,697 +0,0 @@
---- mysql-test/suite/sys_vars/r/sysvars_innodb.result 2018-07-30 23:41:05.030930072 +0200
-+++ mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.reject 2018-07-31 09:45:20.330811949 +0200
-@@ -47,6 +47,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)
-+NUMERIC_MIN_VALUE 1
-+NUMERIC_MAX_VALUE 64
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_ADAPTIVE_MAX_SLEEP_DELAY
- SESSION_VALUE NULL
- GLOBAL_VALUE 150000
-@@ -355,6 +369,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_BUFFER_POOL_POPULATE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Deprecated. This option has no effect and will be removed in MariaDB 10.2.3.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_BUFFER_POOL_SIZE
- SESSION_VALUE NULL
- GLOBAL_VALUE 8388608
-@@ -446,7 +474,7 @@
- DEFAULT_VALUE ON
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE BOOLEAN
--VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF. Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums.
-+VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
-@@ -467,6 +495,104 @@
- ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_EVICTION_FACTOR
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make page cleaner LRU flushes use evicted instead of flushed page counts for its heuristics
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_CLEANER_FLUSH_CHUNK_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 100
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 100
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Divide page cleaner flush list flush batches into chunks of this size
-+NUMERIC_MIN_VALUE 1
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_FREE_LIST_LWM
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 10
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 10
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Page cleaner will keep on flushing the same buffer pool instance if its free list length is below this percentage of innodb_lru_scan_depth
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 100
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_LRU_CHUNK_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 100
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 100
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Divide page cleaner LRU list flush batches into chunks of this size
-+NUMERIC_MIN_VALUE 1
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_LSN_AGE_FACTOR
-+SESSION_VALUE NULL
-+GLOBAL_VALUE HIGH_CHECKPOINT
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE HIGH_CHECKPOINT
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The formula for LSN age factor for page cleaner adaptive flushing. LEGACY: Original Oracle MySQL 5.6 formula. HIGH_CHECKPOINT: (the default) Percona Server 5.6 formula.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST LEGACY,HIGH_CHECKPOINT
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_CLEANER_MAX_FLUSH_TIME
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1000
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1000
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT The maximum time limit for a single flush list flush iteration by the page cleaner thread in miliseconds
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CLEANER_MAX_LRU_TIME
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1000
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1000
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT The maximum time limit for a single LRU tail flush iteration by the page cleaner thread in miliseconds
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_CMP_PER_INDEX_ENABLED
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -565,6 +691,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_CORRUPT_TABLE_ACTION
-+SESSION_VALUE NULL
-+GLOBAL_VALUE assert
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE assert
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT Warn corruptions of user tables as 'corrupt table' instead of not crashing itself, when used with file_per_table. All file io for the datafile after detected as corrupt are disabled, except for the deletion.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST assert,warn,salvage
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_DATA_FILE_PATH
- SESSION_VALUE NULL
- GLOBAL_VALUE ibdata1:12M:autoextend
-@@ -789,6 +929,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_EMPTY_FREE_LIST_ALGORITHM
-+SESSION_VALUE NULL
-+GLOBAL_VALUE LEGACY
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE BACKOFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The algorithm to use for empty free list handling. Allowed values: LEGACY: Original Oracle MySQL 5.6 handling with single page flushes; BACKOFF: (default) Wait until cleaner produces a free page.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST LEGACY,BACKOFF
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_ENCRYPTION_ROTATE_KEY_AGE
- SESSION_VALUE NULL
- GLOBAL_VALUE 1
-@@ -859,6 +1013,20 @@
- ENUM_VALUE_LIST OFF,ON,FORCE
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_FAKE_CHANGES
-+SESSION_VALUE OFF
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE SESSION
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_FAST_SHUTDOWN
- SESSION_VALUE NULL
- GLOBAL_VALUE 1
-@@ -986,11 +1154,11 @@
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT
--SESSION_VALUE NULL
-+SESSION_VALUE 1
- GLOBAL_VALUE 1
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 1
--VARIABLE_SCOPE GLOBAL
-+VARIABLE_SCOPE SESSION
- VARIABLE_TYPE BIGINT UNSIGNED
- VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
- NUMERIC_MIN_VALUE 0
-@@ -1069,6 +1237,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_FOREGROUND_PREFLUSH
-+SESSION_VALUE NULL
-+GLOBAL_VALUE EXPONENTIAL_BACKOFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE EXPONENTIAL_BACKOFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The algorithm InnoDB uses for the query threads at sync preflush. Possible values are SYNC_PREFLUSH: perform a sync preflush as Oracle MySQL; EXPONENTIAL_BACKOFF: (default) wait for the page cleaner flush.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST SYNC_PREFLUSH,EXPONENTIAL_BACKOFF
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_FT_AUX_TABLE
- SESSION_VALUE NULL
- GLOBAL_VALUE
-@@ -1307,6 +1489,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_KILL_IDLE_TRANSACTION
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 0
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 0
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT
-+VARIABLE_COMMENT No effect for this build.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 9223372036854775807
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_LARGE_PREFIX
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -1335,6 +1531,20 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_LOCKING_FAKE_CHANGES
-+SESSION_VALUE NULL
-+GLOBAL_VALUE ON
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE ON
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT ###EXPERIMENTAL### if enabled, transactions will get S row locks instead of X locks for fake changes. If disabled, fake change transactions will not take any locks at all.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_LOCKS_UNSAFE_FOR_BINLOG
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -1377,6 +1587,62 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_LOG_ARCHIVE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Set to 1 if you want to have logs archived.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_LOG_ARCH_DIR
-+SESSION_VALUE NULL
-+GLOBAL_VALUE PATH
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE VARCHAR
-+VARIABLE_COMMENT Where full logs should be archived.
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST NULL
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_LOG_ARCH_EXPIRE_SEC
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 0
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 0
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Expiration time for archived innodb transaction logs.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_LOG_BLOCK_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 512
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 512
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT ###EXPERIMENTAL###: The log block size of the transaction log file. Changing for created log file is not supported. Use on your own risk!
-+NUMERIC_MIN_VALUE 512
-+NUMERIC_MAX_VALUE 65536
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_LOG_BUFFER_SIZE
- SESSION_VALUE NULL
- GLOBAL_VALUE 1048576
-@@ -1405,6 +1671,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_LOG_CHECKSUM_ALGORITHM
-+SESSION_VALUE NULL
-+GLOBAL_VALUE INNODB
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE INNODB
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE ENUM
-+VARIABLE_COMMENT The algorithm InnoDB uses for log block checksums. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Logs created when this option is set to crc32/strict_crc32/none/strict_none will not be readable by any MySQL version or Percona Server versions that donot support this feature
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES
- SESSION_VALUE NULL
- GLOBAL_VALUE ON
-@@ -1475,6 +1755,34 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_MAX_BITMAP_FILE_SIZE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 104857600
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 104857600
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT The maximum size of changed page bitmap files
-+NUMERIC_MIN_VALUE 4096
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_MAX_CHANGED_PAGES
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 1000000
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 1000000
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT The maximum number of rows for INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, 0 - unlimited
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 18446744073709551615
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_MAX_DIRTY_PAGES_PCT
- SESSION_VALUE NULL
- GLOBAL_VALUE 75.000000
-@@ -1659,7 +1967,7 @@
- COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_OPEN_FILES
- SESSION_VALUE NULL
--GLOBAL_VALUE 2000
-+GLOBAL_VALUE 300
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE 0
- VARIABLE_SCOPE GLOBAL
-@@ -1741,6 +2049,76 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRINT_LOCK_WAIT_TIMEOUT_INFO
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Print lock wait timeout info to MySQL error log (off by default)
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_CLEANER
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make buffer pool cleaner and LRU manager threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_IO
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make I/O threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_MASTER
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make buffer pool cleaner thread acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_PRIORITY_PURGE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Make purge coordinator and worker threads acquire shared resources with priority
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_PURGE_BATCH_SIZE
- SESSION_VALUE NULL
- GLOBAL_VALUE 300
-@@ -1909,6 +2287,48 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_SCHED_PRIORITY_IO
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 19
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 19
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Nice value for the I/O handler thread scheduling
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 39
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_SCHED_PRIORITY_MASTER
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 19
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 19
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Nice value for the master thread scheduling
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 39
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_SCHED_PRIORITY_PURGE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 19
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 19
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Nice value for the purge thread scheduling
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 39
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
- VARIABLE_NAME INNODB_SCRUB_LOG
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -1937,6 +2357,34 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_SHOW_LOCKS_HELD
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 10
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 10
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Number of locks held to print for each InnoDB transaction in SHOW INNODB STATUS.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 1000
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT REQUIRED
-+VARIABLE_NAME INNODB_SHOW_VERBOSE_LOCKS
-+SESSION_VALUE NULL
-+GLOBAL_VALUE 0
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE 0
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BIGINT UNSIGNED
-+VARIABLE_COMMENT Whether to show records locked in SHOW INNODB STATUS.
-+NUMERIC_MIN_VALUE 0
-+NUMERIC_MAX_VALUE 1
-+NUMERIC_BLOCK_SIZE 0
-+ENUM_VALUE_LIST NULL
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_SIMULATE_COMP_FAILURES
- SESSION_VALUE NULL
- GLOBAL_VALUE 0
-@@ -2014,7 +2462,7 @@
- DEFAULT_VALUE nulls_equal
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE ENUM
--VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs. Possible values are NULLS_EQUAL (default), NULLS_UNEQUAL and NULLS_IGNORED
-+VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
-@@ -2259,6 +2707,34 @@
- ENUM_VALUE_LIST NULL
- READ_ONLY NO
- COMMAND_LINE_ARGUMENT OPTIONAL
-+VARIABLE_NAME INNODB_TRACK_CHANGED_PAGES
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Track the redo log for changed pages and output a changed page bitmap
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT NONE
-+VARIABLE_NAME INNODB_TRACK_REDO_LOG_NOW
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Force log tracker to catch up with checkpoint now
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -2336,7 +2812,7 @@
- DEFAULT_VALUE OFF
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE BOOLEAN
--VARIABLE_COMMENT Prevent partial page writes, via atomic writes.The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer.Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
-+VARIABLE_COMMENT Prevent partial page writes, via atomic writes (beta). The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer. Currently this option works only on Linux only with FusionIO device, and directFS filesystem.
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
-@@ -2357,6 +2833,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT NONE
-+VARIABLE_NAME INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT
-+SESSION_VALUE NULL
-+GLOBAL_VALUE ON
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE ON
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Use global innodb_flush_log_at_trx_commit value. (default: ON).
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY NO
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_USE_MTFLUSH
- SESSION_VALUE NULL
- GLOBAL_VALUE OFF
-@@ -2371,6 +2861,20 @@
- ENUM_VALUE_LIST OFF,ON
- READ_ONLY YES
- COMMAND_LINE_ARGUMENT NONE
-+VARIABLE_NAME INNODB_USE_STACKTRACE
-+SESSION_VALUE NULL
-+GLOBAL_VALUE OFF
-+GLOBAL_VALUE_ORIGIN COMPILE-TIME
-+DEFAULT_VALUE OFF
-+VARIABLE_SCOPE GLOBAL
-+VARIABLE_TYPE BOOLEAN
-+VARIABLE_COMMENT Print stacktrace on long semaphore wait (off by default supported only on linux)
-+NUMERIC_MIN_VALUE NULL
-+NUMERIC_MAX_VALUE NULL
-+NUMERIC_BLOCK_SIZE NULL
-+ENUM_VALUE_LIST OFF,ON
-+READ_ONLY YES
-+COMMAND_LINE_ARGUMENT NONE
- VARIABLE_NAME INNODB_USE_SYS_MALLOC
- SESSION_VALUE NULL
- GLOBAL_VALUE ON
-@@ -2401,12 +2905,12 @@
- COMMAND_LINE_ARGUMENT OPTIONAL
- VARIABLE_NAME INNODB_VERSION
- SESSION_VALUE NULL
--GLOBAL_VALUE 5.6.44
-+GLOBAL_VALUE 5.6.43-84.3
- GLOBAL_VALUE_ORIGIN COMPILE-TIME
- DEFAULT_VALUE NULL
- VARIABLE_SCOPE GLOBAL
- VARIABLE_TYPE VARCHAR
--VARIABLE_COMMENT InnoDB version
-+VARIABLE_COMMENT Percona-InnoDB-plugin version
- NUMERIC_MIN_VALUE NULL
- NUMERIC_MAX_VALUE NULL
- NUMERIC_BLOCK_SIZE NULL
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index 159d8ca7ae1..440e27edaf0 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -400,25 +400,11 @@ NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
-VARIABLE_NAME INNODB_CHECKSUMS
-SESSION_VALUE NULL
-GLOBAL_VALUE ON
-GLOBAL_VALUE_ORIGIN COMPILE-TIME
-DEFAULT_VALUE ON
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BOOLEAN
-VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF. Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums.
-NUMERIC_MIN_VALUE NULL
-NUMERIC_MAX_VALUE NULL
-NUMERIC_BLOCK_SIZE NULL
-ENUM_VALUE_LIST OFF,ON
-READ_ONLY YES
-COMMAND_LINE_ARGUMENT NONE
VARIABLE_NAME INNODB_CHECKSUM_ALGORITHM
SESSION_VALUE NULL
-GLOBAL_VALUE crc32
+GLOBAL_VALUE full_crc32
GLOBAL_VALUE_ORIGIN COMPILE-TIME
-DEFAULT_VALUE crc32
+DEFAULT_VALUE full_crc32
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM
VARIABLE_COMMENT The algorithm InnoDB uses for page checksumming. Possible values are FULL_CRC32 for new files, always use CRC-32C; for old, see CRC32 below; STRICT_FULL_CRC32 for new files, always use CRC-32C; for old, see STRICT_CRC32 below; CRC32 write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Files updated when this option is set to crc32 or strict_crc32 will not be readable by MariaDB versions older than 10.0.4; new files created with full_crc32 are readable by MariaDB 10.4.3+
@@ -1338,20 +1324,6 @@ NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
-VARIABLE_NAME INNODB_LOCKS_UNSAFE_FOR_BINLOG
-SESSION_VALUE NULL
-GLOBAL_VALUE OFF
-GLOBAL_VALUE_ORIGIN COMPILE-TIME
-DEFAULT_VALUE OFF
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BOOLEAN
-VARIABLE_COMMENT DEPRECATED. This option may be removed in future releases. Please use READ COMMITTED transaction isolation level instead. Force InnoDB to not use next-key locking, to use only row-level locking.
-NUMERIC_MIN_VALUE NULL
-NUMERIC_MAX_VALUE NULL
-NUMERIC_BLOCK_SIZE NULL
-ENUM_VALUE_LIST OFF,ON
-READ_ONLY YES
-COMMAND_LINE_ARGUMENT NONE
VARIABLE_NAME INNODB_LOCK_SCHEDULE_ALGORITHM
SESSION_VALUE NULL
GLOBAL_VALUE fcfs
@@ -1415,7 +1387,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE ON
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
-VARIABLE_COMMENT Whether to compute and require checksums for InnoDB redo log blocks
+VARIABLE_COMMENT Deprecated parameter with no effect.
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
@@ -1954,20 +1926,6 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST OFF,ON
READ_ONLY YES
COMMAND_LINE_ARGUMENT OPTIONAL
-VARIABLE_NAME INNODB_ROLLBACK_SEGMENTS
-SESSION_VALUE NULL
-GLOBAL_VALUE 128
-GLOBAL_VALUE_ORIGIN COMPILE-TIME
-DEFAULT_VALUE 128
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
-VARIABLE_COMMENT Number of undo logs to use (deprecated).
-NUMERIC_MIN_VALUE 1
-NUMERIC_MAX_VALUE 128
-NUMERIC_BLOCK_SIZE 0
-ENUM_VALUE_LIST NULL
-READ_ONLY NO
-COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_SAVED_PAGE_NUMBER_DEBUG
SESSION_VALUE NULL
GLOBAL_VALUE 0
@@ -2150,20 +2108,6 @@ NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
-VARIABLE_NAME INNODB_STATS_SAMPLE_PAGES
-SESSION_VALUE NULL
-GLOBAL_VALUE 8
-GLOBAL_VALUE_ORIGIN COMPILE-TIME
-DEFAULT_VALUE 8
-VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
-VARIABLE_COMMENT Deprecated, use innodb_stats_transient_sample_pages instead
-NUMERIC_MIN_VALUE 1
-NUMERIC_MAX_VALUE 18446744073709551615
-NUMERIC_BLOCK_SIZE 0
-ENUM_VALUE_LIST NULL
-READ_ONLY NO
-COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME INNODB_STATS_TRADITIONAL
SESSION_VALUE NULL
GLOBAL_VALUE ON
@@ -2395,8 +2339,8 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 128
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
-VARIABLE_COMMENT Number of undo logs to use.
-NUMERIC_MIN_VALUE 1
+VARIABLE_COMMENT Deprecated parameter with no effect.
+NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 128
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 134c457dd8d..cd39a9e9882 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -5347,6 +5347,34 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST one-thread-per-connection,no-threads,pool-of-threads
READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
+VARIABLE_NAME THREAD_POOL_DEDICATED_LISTENER
+SESSION_VALUE NULL
+GLOBAL_VALUE OFF
+GLOBAL_VALUE_ORIGIN COMPILE-TIME
+DEFAULT_VALUE OFF
+VARIABLE_SCOPE GLOBAL
+VARIABLE_TYPE BOOLEAN
+VARIABLE_COMMENT If set to 1,listener thread will not pick up queries
+NUMERIC_MIN_VALUE NULL
+NUMERIC_MAX_VALUE NULL
+NUMERIC_BLOCK_SIZE NULL
+ENUM_VALUE_LIST OFF,ON
+READ_ONLY NO
+COMMAND_LINE_ARGUMENT OPTIONAL
+VARIABLE_NAME THREAD_POOL_EXACT_STATS
+SESSION_VALUE NULL
+GLOBAL_VALUE OFF
+GLOBAL_VALUE_ORIGIN COMPILE-TIME
+DEFAULT_VALUE OFF
+VARIABLE_SCOPE GLOBAL
+VARIABLE_TYPE BOOLEAN
+VARIABLE_COMMENT If set to 1, provides better statistics in information_schema threadpool tables
+NUMERIC_MIN_VALUE NULL
+NUMERIC_MAX_VALUE NULL
+NUMERIC_BLOCK_SIZE NULL
+ENUM_VALUE_LIST OFF,ON
+READ_ONLY NO
+COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME THREAD_POOL_IDLE_TIMEOUT
SESSION_VALUE NULL
GLOBAL_VALUE 60
@@ -5439,7 +5467,7 @@ DEFAULT_VALUE 500
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum query execution time in milliseconds,before an executing non-yielding thread is considered stalled.If a worker thread is stalled, additional worker thread may be created to handle remaining clients.
-NUMERIC_MIN_VALUE 10
+NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
diff --git a/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result b/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result
index eda4e6baebe..0a4d8dea6d2 100644
--- a/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result
+++ b/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result
@@ -37,7 +37,7 @@ Warnings:
Warning 1292 Truncated incorrect thread_pool_stall_limit value: '-1'
select @@global.thread_pool_stall_limit;
@@global.thread_pool_stall_limit
-10
+1
set global thread_pool_stall_limit=10000000000;
Warnings:
Warning 1292 Truncated incorrect thread_pool_stall_limit value: '10000000000'
diff --git a/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test b/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
deleted file mode 100644
index 5db0a18e8fd..00000000000
--- a/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-################## mysql-test\t\innodb_checksums_basic.test ###################
-# #
-# Variable Name: innodb_checksums #
-# Scope: Global #
-# Access Type: Static #
-# Data Type: boolean #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author : Sharique Abdullah #
-# #
-# #
-# Description:Test Cases of Dynamic System Variable innodb_checksums #
-# that checks the behavior of this variable in the following ways #
-# * Value Check #
-# * Scope Check #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/have_innodb.inc
-
---echo '#---------------------BS_STVARS_023_01----------------------#'
-####################################################################
-# Displaying default value #
-####################################################################
-SELECT COUNT(@@GLOBAL.innodb_checksums);
---echo 1 Expected
-
-
---echo '#---------------------BS_STVARS_023_02----------------------#'
-####################################################################
-# Check if Value can set #
-####################################################################
-
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@GLOBAL.innodb_checksums=1;
---echo Expected error 'Read only variable'
-
-SELECT COUNT(@@GLOBAL.innodb_checksums);
---echo 1 Expected
-
-
-
-
---echo '#---------------------BS_STVARS_023_03----------------------#'
-#################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#################################################################
-
---disable_warnings
-SELECT IF(@@GLOBAL.innodb_checksums, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_checksums';
---enable_warnings
---echo 1 Expected
-
-SELECT COUNT(@@GLOBAL.innodb_checksums);
---echo 1 Expected
-
---disable_warnings
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_checksums';
---enable_warnings
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_023_04----------------------#'
-################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-################################################################################
-SELECT @@innodb_checksums = @@GLOBAL.innodb_checksums;
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_023_05----------------------#'
-################################################################################
-# Check if innodb_checksums can be accessed with and without @@ sign #
-################################################################################
-
-SELECT COUNT(@@innodb_checksums);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.innodb_checksums);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.innodb_checksums);
---echo Expected error 'Variable is a GLOBAL variable'
-
-SELECT COUNT(@@GLOBAL.innodb_checksums);
---echo 1 Expected
-
---Error ER_BAD_FIELD_ERROR
-SELECT innodb_checksums = @@SESSION.innodb_checksums;
---echo Expected error 'Readonly variable'
-
-
diff --git a/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test b/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
deleted file mode 100644
index 755c5c62c70..00000000000
--- a/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-################## mysql-test\t\innodb_locks_unsafe_for_binlog_basic.test #####
-# #
-# Variable Name: innodb_locks_unsafe_for_binlog #
-# Scope: Global #
-# Access Type: Static #
-# Data Type: boolean #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author : Sharique Abdullah #
-# #
-# #
-# Description:Test Cases of Dynamic System Variable innodb_locks_unsafe_for_binlog#
-# that checks the behavior of this variable in the following ways #
-# * Value Check #
-# * Scope Check #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/have_innodb.inc
-
---echo '#---------------------BS_STVARS_031_01----------------------#'
-####################################################################
-# Displaying default value #
-####################################################################
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
---echo 1 Expected
-
-
---echo '#---------------------BS_STVARS_031_02----------------------#'
-####################################################################
-# Check if Value can set #
-####################################################################
-
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@GLOBAL.innodb_locks_unsafe_for_binlog=1;
---echo Expected error 'Read only variable'
-
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
---echo 1 Expected
-
-
-
-
---echo '#---------------------BS_STVARS_031_03----------------------#'
-#################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#################################################################
-
---disable_warnings
-SELECT IF(@@GLOBAL.innodb_locks_unsafe_for_binlog, "ON", "OFF") = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_locks_unsafe_for_binlog';
---enable_warnings
---echo 1 Expected
-
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
---echo 1 Expected
-
---disable_warnings
-SELECT COUNT(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_locks_unsafe_for_binlog';
---enable_warnings
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_031_04----------------------#'
-################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-################################################################################
-SELECT @@innodb_locks_unsafe_for_binlog = @@GLOBAL.innodb_locks_unsafe_for_binlog;
---echo 1 Expected
-
-
-
---echo '#---------------------BS_STVARS_031_05----------------------#'
-################################################################################
-# Check if innodb_locks_unsafe_for_binlog can be accessed with and without @@ sign #
-################################################################################
-
-SELECT COUNT(@@innodb_locks_unsafe_for_binlog);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.innodb_locks_unsafe_for_binlog);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.innodb_locks_unsafe_for_binlog);
---echo Expected error 'Variable is a GLOBAL variable'
-
-SELECT COUNT(@@GLOBAL.innodb_locks_unsafe_for_binlog);
---echo 1 Expected
-
---Error ER_BAD_FIELD_ERROR
-SELECT innodb_locks_unsafe_for_binlog = @@SESSION.innodb_locks_unsafe_for_binlog;
---echo Expected error 'Readonly variable'
-
-
diff --git a/mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test b/mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test
deleted file mode 100644
index 33223d4c064..00000000000
--- a/mysql-test/suite/sys_vars/t/innodb_rollback_segments_basic.test
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# 2011-08-01 Added
-#
-
---source include/have_innodb.inc
-
-SET @start_global_value = @@global.innodb_rollback_segments;
-SELECT @start_global_value;
-
-#
-# exists as global only
-#
---echo Valid values are zero or above
-SELECT @@global.innodb_rollback_segments >=0;
-SELECT @@global.innodb_rollback_segments <=128;
-SELECT @@global.innodb_rollback_segments;
-
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@session.innodb_rollback_segments;
-SHOW global variables LIKE 'innodb_rollback_segments';
-SHOW session variables LIKE 'innodb_rollback_segments';
---disable_warnings
-SELECT * FROM information_schema.global_variables
-WHERE variable_name='innodb_rollback_segments';
-SELECT * FROM information_schema.session_variables
-WHERE variable_name='innodb_rollback_segments';
---enable_warnings
-
-#
-# show that it's writable
-#
-SET global innodb_rollback_segments=100;
-SELECT @@global.innodb_rollback_segments;
---disable_warnings
-SELECT * FROM information_schema.global_variables
-WHERE variable_name='innodb_rollback_segments';
-SELECT * FROM information_schema.session_variables
-WHERE variable_name='innodb_rollback_segments';
---enable_warnings
---error ER_GLOBAL_VARIABLE
-SET session innodb_rollback_segments=1;
-
-#
-# incorrect types
-#
---error ER_WRONG_TYPE_FOR_VAR
-SET global innodb_rollback_segments=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-SET global innodb_rollback_segments=1e1;
---error ER_WRONG_TYPE_FOR_VAR
-SET global innodb_rollback_segments="foo";
-SET global innodb_rollback_segments=-7;
-SELECT @@global.innodb_rollback_segments;
---disable_warnings
-SELECT * FROM information_schema.global_variables
-WHERE variable_name='innodb_rollback_segments';
---enable_warnings
-
-#
-# cleanup
-#
-
-SET @@global.innodb_rollback_segments = @start_global_value;
-SELECT @@global.innodb_rollback_segments;
diff --git a/mysql-test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test b/mysql-test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test
deleted file mode 100644
index 0e4fcb508ac..00000000000
--- a/mysql-test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test
+++ /dev/null
@@ -1,72 +0,0 @@
-
-#
-# 2010-01-27 - Added
-#
-
---source include/have_innodb.inc
-
-SET @start_global_value = @@global.innodb_stats_sample_pages;
-SELECT @start_global_value;
-
-#
-# exists as global only
-#
---echo Valid values are one or above
-select @@global.innodb_stats_sample_pages >=1;
-select @@global.innodb_stats_sample_pages;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.innodb_stats_sample_pages;
-show global variables like 'innodb_stats_sample_pages';
-show session variables like 'innodb_stats_sample_pages';
---disable_warnings
-select * from information_schema.global_variables where variable_name='innodb_stats_sample_pages';
-select * from information_schema.session_variables where variable_name='innodb_stats_sample_pages';
---enable_warnings
-
-#
-# show that it's writable
-#
-set global innodb_stats_sample_pages=10;
-select @@global.innodb_stats_sample_pages;
---disable_warnings
-select * from information_schema.global_variables where variable_name='innodb_stats_sample_pages';
-select * from information_schema.session_variables where variable_name='innodb_stats_sample_pages';
---enable_warnings
---error ER_GLOBAL_VARIABLE
-set session innodb_stats_sample_pages=1;
-
-#
-# show the default value
-#
-set global innodb_stats_sample_pages=DEFAULT;
-select @@global.innodb_stats_sample_pages;
-
-
-#
-# invalid values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global innodb_stats_sample_pages = 1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global innodb_stats_sample_pages = 1e1;
---error ER_WRONG_TYPE_FOR_VAR
-set global innodb_stats_sample_pages = "foo";
---error ER_WRONG_TYPE_FOR_VAR
-set global innodb_stats_sample_pages=' ';
-select @@global.innodb_stats_sample_pages;
---error ER_WRONG_TYPE_FOR_VAR
-set global innodb_stats_sample_pages=" ";
-select @@global.innodb_stats_sample_pages;
-
-set global innodb_stats_sample_pages=-7;
-select @@global.innodb_stats_sample_pages;
---disable_warnings
-select * from information_schema.global_variables where variable_name='innodb_stats_sample_pages';
---enable_warnings
-
-
-#
-# cleanup
-#
-SET @@global.innodb_stats_sample_pages = @start_global_value;
-SELECT @@global.innodb_stats_sample_pages;
diff --git a/mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test b/mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test
index 897d3de42e0..d3d50890a8c 100644
--- a/mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test
@@ -11,8 +11,8 @@ SELECT @start_global_value;
#
# exists as global only
#
---echo Valid values are zero or above
-SELECT @@global.innodb_stats_transient_sample_pages >=0;
+--echo Valid values are one or above
+SELECT @@global.innodb_stats_transient_sample_pages >=1;
SELECT @@global.innodb_stats_transient_sample_pages;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT @@session.innodb_stats_transient_sample_pages;
diff --git a/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.opt b/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.opt
new file mode 100644
index 00000000000..71866672bd9
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.opt
@@ -0,0 +1 @@
+--innodb-undo-logs=42
diff --git a/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test b/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test
index f83b5ede247..54ee06d94cb 100644
--- a/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test
@@ -1,97 +1,42 @@
-################## mysql-test/t/innodb_undo_logs_basic.test ############
-# #
-# Variable Name: innodb_undo_logs #
-# Scope: Global #
-# Access Type: Static #
-# Data Type: numeric #
-# #
-# #
-# Creation Date: 2011-07-05 #
-# Author : Sunny Bains #
-# #
-# #
-# Description: Read-only config global variable innodb_undo_logs #
-# * Value check #
-# * Scope check #
-# #
-###############################################################################
+#
+# 2011-08-01 Added
+#
--source include/have_innodb.inc
-####################################################################
-# Display default value #
-####################################################################
-SELECT @@GLOBAL.innodb_undo_logs;
---echo 128 Expected
-
-
-####################################################################
-# Check if value can be set #
-####################################################################
-
-SET @@GLOBAL.innodb_undo_logs=128;
-
-SELECT COUNT(@@GLOBAL.innodb_undo_logs);
---echo 1 Expected
-
-
-################################################################################
-# Check if the value in GLOBAL table matches value in variable #
-################################################################################
+#
+# exists as global only
+#
+SELECT @@global.innodb_undo_logs;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@session.innodb_undo_logs;
+SHOW global variables LIKE 'innodb_undo_logs';
+SHOW session variables LIKE 'innodb_undo_logs';
--disable_warnings
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_undo_logs';
+SELECT * FROM information_schema.global_variables
+WHERE variable_name='innodb_undo_logs';
+SELECT * FROM information_schema.session_variables
+WHERE variable_name='innodb_undo_logs';
--enable_warnings
---echo 128 Expected
-
-
-################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-################################################################################
-SELECT @@innodb_undo_logs = @@GLOBAL.innodb_undo_logs;
---echo 1 Expected
-
-################################################################################
-# Check if innodb_undo_logs can be accessed with and without @@ sign #
-################################################################################
-
-SELECT COUNT(@@innodb_undo_logs);
---echo 1 Expected
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@local.innodb_undo_logs);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT COUNT(@@SESSION.innodb_undo_logs);
---echo Expected error 'Variable is a GLOBAL variable'
-
---Error ER_BAD_FIELD_ERROR
-SELECT innodb_undo_logs = @@SESSION.innodb_undo_logs;
-
-# Begin Bug 13604034
-# SET GLOBAL INNODB_UNDO_LOGS=0 SUCCEEDS BUT LEADS TO AN ASSERT
-# MAX_UNDO_LOGS > 0
---echo Begin bug 13604034
-select @@innodb_undo_logs;
---echo 128 Expected
-set global innodb_undo_logs = 129;
-select @@innodb_undo_logs;
---echo 128 Expected
-set global innodb_undo_logs = 0;
-select @@innodb_undo_logs;
---echo 1 Expected
-set global innodb_undo_logs = -1;
-select @@innodb_undo_logs;
---echo 1 Expected
-set global innodb_undo_logs = 50;
-select @@innodb_undo_logs;
---echo 50 Expected
-set global innodb_undo_logs = default;
-select @@innodb_undo_logs;
---echo 128 Expected
---echo End bug 13604034
-# End Bug 13604034
+SET global innodb_undo_logs=100;
+SELECT @@global.innodb_undo_logs;
+--error ER_GLOBAL_VARIABLE
+SET session innodb_undo_logs=1;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+SET global innodb_undo_logs=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+SET global innodb_undo_logs=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+SET global innodb_undo_logs="foo";
+SET global innodb_undo_logs=-7;
+SELECT @@global.innodb_undo_logs;
+--disable_warnings
+SELECT * FROM information_schema.global_variables
+WHERE variable_name='innodb_undo_logs';
+--enable_warnings
diff --git a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
index 9b4e1df7ab0..1ab27907535 100644
--- a/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
@@ -1,5 +1,4 @@
# uint global
---source include/not_windows.inc
--source include/not_embedded.inc
SET @start_global_value = @@global.thread_pool_stall_limit;