diff options
142 files changed, 4149 insertions, 85 deletions
diff --git a/cmake/create_initial_db.cmake b/cmake/create_initial_db.cmake index c786815964f..a996ab76d19 100644 --- a/cmake/create_initial_db.cmake +++ b/cmake/create_initial_db.cmake @@ -34,9 +34,11 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql mysql_perf ENDIF() ENDFOREACH() ENDFOREACH() -FILE(READ ${TOP_SRCDIR}/scripts/fill_help_tables.sql CONTENTS) -FILE(APPEND bootstrap.sql "${CONTENTS}") +FOREACH(FILENAME ${TOP_SRCDIR}/scripts/fill_help_tables.sql ${TOP_SRCDIR}/scripts/mysql_sys_schema.sql) + FILE(READ ${FILENAME} CONTENTS) + FILE(APPEND bootstrap.sql "${CONTENTS}") +ENDFOREACH() MAKE_DIRECTORY(mysql) diff --git a/debian/mariadb-server-core-10.6.install b/debian/mariadb-server-core-10.6.install index 77e673e4e0b..aa7e143078c 100644 --- a/debian/mariadb-server-core-10.6.install +++ b/debian/mariadb-server-core-10.6.install @@ -30,6 +30,7 @@ usr/share/mysql/japanese usr/share/mysql/korean usr/share/mysql/maria_add_gis_sp_bootstrap.sql usr/share/mysql/mysql_performance_tables.sql +usr/share/mysql/mysql_sys_schema.sql usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_system_tables_data.sql usr/share/mysql/mysql_test_data_timezone.sql diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index 76cd06e5d38..b330ff448a4 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -71,9 +71,9 @@ BEGIN SELECT * FROM INFORMATION_SCHEMA.EVENTS; -- Dump all triggers except mtr internals, there should be none SELECT * FROM INFORMATION_SCHEMA.TRIGGERS - WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); + WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert') AND TRIGGER_SCHEMA != 'sys'; -- Dump all created procedures, there should be none - SELECT * FROM INFORMATION_SCHEMA.ROUTINES; + SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA != 'sys'; SHOW STATUS LIKE 'slave_open_temp_tables'; @@ -87,7 +87,7 @@ BEGIN mysql.help_keyword, mysql.help_relation, mysql.plugin, - mysql.proc, +-- mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, diff --git a/mysql-test/include/mysql_upgrade_preparation.inc b/mysql-test/include/mysql_upgrade_preparation.inc index 03019ae29ff..6cdaf6dd3d4 100644 --- a/mysql-test/include/mysql_upgrade_preparation.inc +++ b/mysql-test/include/mysql_upgrade_preparation.inc @@ -2,6 +2,9 @@ # Can't run test of external client with embedded server -- source include/not_embedded.inc +# diff in the output, if perfschema is not compiled in +# (sys schema views are missing) +-- source include/have_perfschema.inc # # Hack: # diff --git a/mysql-test/main/1st.result b/mysql-test/main/1st.result index c630be1d61c..f52a0218ced 100644 --- a/mysql-test/main/1st.result +++ b/mysql-test/main/1st.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test show tables in mysql; Tables_in_mysql diff --git a/mysql-test/main/create_drop_role.result b/mysql-test/main/create_drop_role.result index 886dcfd0e72..b7ec45daeae 100644 --- a/mysql-test/main/create_drop_role.result +++ b/mysql-test/main/create_drop_role.result @@ -65,6 +65,7 @@ information_schema mtr mysql performance_schema +sys test SET ROLE NONE; connect user_b, localhost, root,,; diff --git a/mysql-test/main/ctype_upgrade.result b/mysql-test/main/ctype_upgrade.result index 9d19c3b5203..efad15f87f3 100644 --- a/mysql-test/main/ctype_upgrade.result +++ b/mysql-test/main/ctype_upgrade.result @@ -261,6 +261,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -270,6 +370,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.maria050313_ucs2_croatian_ci_def Needs upgrade test.maria050313_utf8_croatian_ci Needs upgrade @@ -320,6 +422,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -329,6 +531,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.maria050313_ucs2_croatian_ci_def OK test.maria050313_utf8_croatian_ci OK diff --git a/mysql-test/main/drop.result b/mysql-test/main/drop.result index d50ffabc9fa..73beabc35fa 100644 --- a/mysql-test/main/drop.result +++ b/mysql-test/main/drop.result @@ -52,6 +52,7 @@ mtr mysql mysqltest performance_schema +sys test flush tables with read lock; drop database mysqltest; @@ -64,6 +65,7 @@ information_schema mtr mysql performance_schema +sys test drop database mysqltest; ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result index 379a33dbb34..c849612a53e 100644 --- a/mysql-test/main/information_schema.result +++ b/mysql-test/main/information_schema.result @@ -14,6 +14,7 @@ CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_P def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL select schema_name from information_schema.schemata; schema_name @@ -21,6 +22,7 @@ information_schema mtr mysql performance_schema +sys test show databases like 't%'; Database (t%) @@ -31,6 +33,7 @@ information_schema mtr mysql performance_schema +sys test show databases where `database` = 't%'; Database @@ -368,12 +371,12 @@ test sub1 drop view v1; connect user1,localhost,mysqltest_1,,; connection user1; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; ROUTINE_NAME ROUTINE_DEFINITION show create function sub1; ERROR 42000: FUNCTION sub1 does not exist connection user3; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; ROUTINE_NAME ROUTINE_DEFINITION sel2 NULL sub1 NULL @@ -381,13 +384,13 @@ connection default; grant all privileges on test.* to mysqltest_1@localhost; connect user2,localhost,mysqltest_1,,; connection user2; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; ROUTINE_NAME ROUTINE_DEFINITION sel2 NULL sub1 NULL create function sub2(i int) returns int return i+1; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; ROUTINE_NAME ROUTINE_DEFINITION sel2 NULL sub1 NULL @@ -423,6 +426,7 @@ information_schema mtr mysql performance_schema +sys test explain select * from v0; id select_type table type possible_keys key key_len ref rows Extra @@ -458,7 +462,7 @@ latin1_swedish_nopad_ci latin1_nopad_bin show keys from v4; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored -select * from information_schema.views where TABLE_NAME like "v%"; +select * from information_schema.views where TABLE_NAME like "v%" AND TABLE_SCHEMA <> 'sys'; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM def test v0 select `information_schema`.`schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata` NONE NO root@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED def test v1 select `information_schema`.`tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where `information_schema`.`tables`.`TABLE_NAME` = 'v1' NONE NO root@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED @@ -563,7 +567,7 @@ create table t1(a int); create view v1 (c) as select a from t1 with check option; create view v2 (c) as select a from t1 WITH LOCAL CHECK OPTION; create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION; -select * from information_schema.views; +select * from information_schema.views where table_schema <> 'sys'; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION ALGORITHM def mysql user select `mysql`.`global_priv`.`Host` AS `Host`,`mysql`.`global_priv`.`User` AS `User`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.plugin') in ('mysql_native_password','mysql_old_password'),ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.authentication_string'),''),'') AS `Password`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 1,'Y','N') AS `Select_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 2,'Y','N') AS `Insert_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 4,'Y','N') AS `Update_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 8,'Y','N') AS `Delete_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 16,'Y','N') AS `Create_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 32,'Y','N') AS `Drop_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 64,'Y','N') AS `Reload_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 128,'Y','N') AS `Shutdown_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 256,'Y','N') AS `Process_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 512,'Y','N') AS `File_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 1024,'Y','N') AS `Grant_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 2048,'Y','N') AS `References_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 4096,'Y','N') AS `Index_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 8192,'Y','N') AS `Alter_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 16384,'Y','N') AS `Show_db_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 32768,'Y','N') AS `Super_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 65536,'Y','N') AS `Create_tmp_table_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 131072,'Y','N') AS `Lock_tables_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 262144,'Y','N') AS `Execute_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 524288,'Y','N') AS `Repl_slave_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 1048576,'Y','N') AS `Repl_client_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 2097152,'Y','N') AS `Create_view_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 4194304,'Y','N') AS `Show_view_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 8388608,'Y','N') AS `Create_routine_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 16777216,'Y','N') AS `Alter_routine_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 33554432,'Y','N') AS `Create_user_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 67108864,'Y','N') AS `Event_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 134217728,'Y','N') AS `Trigger_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 268435456,'Y','N') AS `Create_tablespace_priv`,if(json_value(`mysql`.`global_priv`.`Priv`,'$.access') & 536870912,'Y','N') AS `Delete_history_priv`,elt(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.ssl_type'),0) + 1,'','ANY','X509','SPECIFIED') AS `ssl_type`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.ssl_cipher'),'') AS `ssl_cipher`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.x509_issuer'),'') AS `x509_issuer`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.x509_subject'),'') AS `x509_subject`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.max_questions'),0) as unsigned) AS `max_questions`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.max_updates'),0) as unsigned) AS `max_updates`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.max_connections'),0) as unsigned) AS `max_connections`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.max_user_connections'),0) as signed) AS `max_user_connections`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.plugin'),'') AS `plugin`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.authentication_string'),'') AS `authentication_string`,if(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.password_last_changed'),1) = 0,'Y','N') AS `password_expired`,elt(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.is_role'),0) + 1,'N','Y') AS `is_role`,ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.default_role'),'') AS `default_role`,cast(ifnull(json_value(`mysql`.`global_priv`.`Priv`,'$.max_statement_time'),0.0) as decimal(12,6)) AS `max_statement_time` from `mysql`.`global_priv` NONE YES mariadb.sys@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED def test v1 select `test`.`t1`.`a` AS `c` from `test`.`t1` CASCADED YES root@localhost DEFINER latin1 latin1_swedish_ci UNDEFINED @@ -884,6 +888,20 @@ information_schema TRIGGERS ACTION_CONDITION information_schema TRIGGERS ACTION_STATEMENT information_schema VIEWS VIEW_DEFINITION mysql global_priv Priv +sys innodb_lock_waits waiting_query +sys innodb_lock_waits blocking_query +sys processlist current_statement +sys processlist last_statement +sys schema_auto_increment_columns column_type +sys schema_table_lock_waits waiting_query +sys session current_statement +sys session last_statement +sys statement_analysis query +sys statements_with_errors_or_warnings query +sys statements_with_full_table_scans query +sys statements_with_runtimes_in_95th_percentile query +sys statements_with_sorting query +sys statements_with_temp_tables query mysql user Password mysql user ssl_cipher mysql user x509_issuer @@ -891,6 +909,17 @@ mysql user x509_subject mysql user plugin mysql user authentication_string mysql user default_role +sys x$processlist current_statement +sys x$processlist last_statement +sys x$schema_table_lock_waits waiting_query +sys x$session current_statement +sys x$session last_statement +sys x$statement_analysis query +sys x$statements_with_errors_or_warnings query +sys x$statements_with_full_table_scans query +sys x$statements_with_runtimes_in_95th_percentile query +sys x$statements_with_sorting query +sys x$statements_with_temp_tables query select table_name, column_name, data_type from information_schema.columns where data_type = 'datetime' and table_name not like 'innodb_%' order by binary table_name, ordinal_position; @@ -920,6 +949,9 @@ event execute_at datetime event last_executed datetime event starts datetime event ends datetime +x$innodb_lock_waits wait_started datetime +x$innodb_lock_waits waiting_trx_started datetime +x$innodb_lock_waits blocking_trx_started datetime SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES A WHERE NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.COLUMNS B @@ -1123,7 +1155,7 @@ drop procedure if exists p2; create procedure p1 () modifies sql data set @a = 5; create procedure p2 () set @a = 5; select sql_data_access from information_schema.routines -where specific_name like 'p%'; +where specific_name like 'p%' and routine_schema = 'test'; sql_data_access MODIFIES SQL DATA CONTAINS SQL @@ -1264,7 +1296,7 @@ INSERT INTO t1 SET f1 = 1, f2 = 'Schoenenbourg', f3 = 1; CREATE FUNCTION func2() RETURNS BIGINT RETURN 1; CREATE FUNCTION func1() RETURNS BIGINT BEGIN -RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS); +RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA <> 'sys'); END// CREATE VIEW v1 AS SELECT 1 FROM t1 WHERE f3 = (SELECT func2 ()); @@ -1421,9 +1453,109 @@ create table t2 (f1 int, f2 int); create view v2 as select f1+1 as a, f2 as b from t2; select table_name, is_updatable from information_schema.views order by table_name; table_name is_updatable +host_summary NO +host_summary_by_file_io NO +host_summary_by_file_io_type YES +host_summary_by_stages YES +host_summary_by_statement_latency NO +host_summary_by_statement_type YES +innodb_buffer_stats_by_schema NO +innodb_buffer_stats_by_table NO +innodb_lock_waits NO +io_by_thread_by_latency NO +io_global_by_file_by_bytes YES +io_global_by_file_by_latency YES +io_global_by_wait_by_bytes YES +io_global_by_wait_by_latency YES +latest_file_io YES +memory_by_host_by_current_bytes NO +memory_by_thread_by_current_bytes NO +memory_by_user_by_current_bytes NO +memory_global_by_current_bytes YES +memory_global_total NO +metrics NO +processlist NO +ps_check_lost_instrumentation YES +schema_auto_increment_columns NO +schema_index_statistics YES +schema_object_overview NO +schema_redundant_indexes NO +schema_tables_with_full_table_scans YES +schema_table_lock_waits NO +schema_table_statistics NO +schema_table_statistics_with_buffer NO +schema_unused_indexes YES +session YES +session_ssl_status YES +statements_with_errors_or_warnings YES +statements_with_full_table_scans YES +statements_with_runtimes_in_95th_percentile YES +statements_with_sorting YES +statements_with_temp_tables YES +statement_analysis YES user YES +user_summary NO +user_summary_by_file_io NO +user_summary_by_file_io_type YES +user_summary_by_stages YES +user_summary_by_statement_latency NO +user_summary_by_statement_type YES v1 NO v2 YES +version NO +waits_by_host_by_latency YES +waits_by_user_by_latency YES +waits_global_by_latency YES +wait_classes_global_by_avg_latency NO +wait_classes_global_by_latency NO +x$host_summary NO +x$host_summary_by_file_io NO +x$host_summary_by_file_io_type YES +x$host_summary_by_stages YES +x$host_summary_by_statement_latency NO +x$host_summary_by_statement_type YES +x$innodb_buffer_stats_by_schema NO +x$innodb_buffer_stats_by_table NO +x$innodb_lock_waits NO +x$io_by_thread_by_latency NO +x$io_global_by_file_by_bytes YES +x$io_global_by_file_by_latency YES +x$io_global_by_wait_by_bytes YES +x$io_global_by_wait_by_latency YES +x$latest_file_io YES +x$memory_by_host_by_current_bytes NO +x$memory_by_thread_by_current_bytes NO +x$memory_by_user_by_current_bytes NO +x$memory_global_by_current_bytes YES +x$memory_global_total NO +x$processlist NO +x$ps_digest_95th_percentile_by_avg_us NO +x$ps_digest_avg_latency_distribution NO +x$ps_schema_table_statistics_io NO +x$schema_flattened_keys NO +x$schema_index_statistics YES +x$schema_tables_with_full_table_scans YES +x$schema_table_lock_waits NO +x$schema_table_statistics NO +x$schema_table_statistics_with_buffer NO +x$session YES +x$statements_with_errors_or_warnings YES +x$statements_with_full_table_scans YES +x$statements_with_runtimes_in_95th_percentile YES +x$statements_with_sorting YES +x$statements_with_temp_tables YES +x$statement_analysis YES +x$user_summary NO +x$user_summary_by_file_io NO +x$user_summary_by_file_io_type YES +x$user_summary_by_stages YES +x$user_summary_by_statement_latency NO +x$user_summary_by_statement_type YES +x$waits_by_host_by_latency YES +x$waits_by_user_by_latency YES +x$waits_global_by_latency YES +x$wait_classes_global_by_avg_latency NO +x$wait_classes_global_by_latency NO delete from v1; drop view v1,v2; drop table t1,t2; diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test index 17c029bc81f..0fb50716af3 100644 --- a/mysql-test/main/information_schema.test +++ b/mysql-test/main/information_schema.test @@ -187,19 +187,19 @@ drop view v1; connect (user1,localhost,mysqltest_1,,); connection user1; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; --error ER_SP_DOES_NOT_EXIST show create function sub1; connection user3; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; connection default; grant all privileges on test.* to mysqltest_1@localhost; connect (user2,localhost,mysqltest_1,,); connection user2; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; create function sub2(i int) returns int return i+1; -select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES; +select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES WHERE ROUTINE_SCHEMA <> 'sys'; show create procedure sel2; show create function sub1; show create function sub2; @@ -233,7 +233,7 @@ where COLLATION_NAME like "latin1%"; select * from v4; show keys from v4; --sorted_result -select * from information_schema.views where TABLE_NAME like "v%"; +select * from information_schema.views where TABLE_NAME like "v%" AND TABLE_SCHEMA <> 'sys'; drop view v0, v1, v2, v3, v4; # @@ -285,7 +285,7 @@ create view v1 (c) as select a from t1 with check option; create view v2 (c) as select a from t1 WITH LOCAL CHECK OPTION; create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION; --sorted_result -select * from information_schema.views; +select * from information_schema.views where table_schema <> 'sys'; grant select (a) on test.t1 to joe@localhost with grant option; select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES; select * from INFORMATION_SCHEMA.TABLE_PRIVILEGES; @@ -671,7 +671,7 @@ drop procedure if exists p2; create procedure p1 () modifies sql data set @a = 5; create procedure p2 () set @a = 5; select sql_data_access from information_schema.routines -where specific_name like 'p%'; +where specific_name like 'p%' and routine_schema = 'test'; drop procedure p1; drop procedure p2; @@ -835,7 +835,7 @@ CREATE FUNCTION func2() RETURNS BIGINT RETURN 1; delimiter //; CREATE FUNCTION func1() RETURNS BIGINT BEGIN - RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS); + RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA <> 'sys'); END// delimiter ;// diff --git a/mysql-test/main/init_file_longline_3816.result b/mysql-test/main/init_file_longline_3816.result index 0155f764592..f670f67ccb8 100644 --- a/mysql-test/main/init_file_longline_3816.result +++ b/mysql-test/main/init_file_longline_3816.result @@ -1,3 +1,3 @@ select count(*) from t4; count(*) -0 +193 diff --git a/mysql-test/main/log_tables_upgrade.result b/mysql-test/main/log_tables_upgrade.result index 8d7b08a11bd..ccdd726cb82 100644 --- a/mysql-test/main/log_tables_upgrade.result +++ b/mysql-test/main/log_tables_upgrade.result @@ -46,6 +46,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -55,6 +155,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/lowercase_fs_off.result b/mysql-test/main/lowercase_fs_off.result index 3e9aa7cc239..0d79db02fc7 100644 --- a/mysql-test/main/lowercase_fs_off.result +++ b/mysql-test/main/lowercase_fs_off.result @@ -137,6 +137,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -147,6 +247,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/mysql_install_db_win.result b/mysql-test/main/mysql_install_db_win.result index ca263935788..936165bd052 100644 --- a/mysql-test/main/mysql_install_db_win.result +++ b/mysql-test/main/mysql_install_db_win.result @@ -6,7 +6,7 @@ Setting root password Creation of the database was successful # Kill the server # restart: --datadir=MYSQLTEST_VARDIR/tmp/ddir --loose-innodb -connect root,localhost,root,foo; +connect root,localhost,root,foo,mysql; SELECT @@datadir; @@datadir DATADIR/ diff --git a/mysql-test/main/mysql_install_db_win.test b/mysql-test/main/mysql_install_db_win.test index dd93e7cb27d..7251ff11481 100644 --- a/mysql-test/main/mysql_install_db_win.test +++ b/mysql-test/main/mysql_install_db_win.test @@ -9,7 +9,7 @@ exec $MYSQL_INSTALL_DB_EXE --datadir=$ddir --password=foo -R; let $restart_parameters=--datadir=$ddir --loose-innodb; --source include/start_mysqld.inc -connect root,localhost,root,foo; +connect (root,localhost,root,foo,mysql); # Smoke test - check that we're actually using datadir # we've created (i.e restart_parameters worked) --replace_result $ddir DATADIR diff --git a/mysql-test/main/mysql_json_mysql_upgrade.result b/mysql-test/main/mysql_json_mysql_upgrade.result index 05863bb3591..768f7301463 100644 --- a/mysql-test/main/mysql_json_mysql_upgrade.result +++ b/mysql-test/main/mysql_json_mysql_upgrade.result @@ -57,6 +57,106 @@ Phase 2/7: Installing used storage engines... Skipped installing plugin for MYSQL_JSON data type Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -66,6 +166,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.mysql_json_test Needs upgrade test.mysql_json_test_big Needs upgrade diff --git a/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result b/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result index 0b2e7af84eb..0a24147bdea 100644 --- a/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result +++ b/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result @@ -57,6 +57,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -66,6 +166,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.mysql_json_test Needs upgrade test.mysql_json_test_big Needs upgrade diff --git a/mysql-test/main/mysql_upgrade-20228.result b/mysql-test/main/mysql_upgrade-20228.result index 30ded626f5a..b58450ea0d9 100644 --- a/mysql-test/main/mysql_upgrade-20228.result +++ b/mysql-test/main/mysql_upgrade-20228.result @@ -50,6 +50,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -59,6 +159,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/mysql_upgrade-6984.result b/mysql-test/main/mysql_upgrade-6984.result index 120f7cf733c..a0ea4607b24 100644 --- a/mysql-test/main/mysql_upgrade-6984.result +++ b/mysql-test/main/mysql_upgrade-6984.result @@ -50,6 +50,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -59,6 +159,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result index 8cb48d21d3c..a85068df421 100644 --- a/mysql-test/main/mysql_upgrade.result +++ b/mysql-test/main/mysql_upgrade.result @@ -34,6 +34,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -43,6 +143,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -83,6 +185,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -92,6 +294,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -132,6 +336,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -141,6 +445,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -186,6 +492,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -195,6 +601,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -241,6 +649,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -250,6 +758,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -299,6 +809,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -308,6 +918,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -396,6 +1008,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -405,6 +1117,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -462,6 +1176,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -471,6 +1285,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -543,6 +1359,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -552,6 +1468,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.t1 OK Phase 7/7: Running 'FLUSH PRIVILEGES' @@ -661,6 +1579,106 @@ Upgrading from a version before MariaDB-10.1 Phase 2/7: Installing used storage engines Checking for tables with unknown storage engine Phase 3/7: Fixing views +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -670,6 +1688,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -735,6 +1755,106 @@ mysql.transaction_registry OK mysql.user OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -744,6 +1864,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -848,6 +1970,7 @@ rename table mysql.global_priv_bak to mysql.global_priv; # of mysql schema from previous versions # call mtr.add_suppression("innodb_table_stats has length mismatch in the column name table_name"); +call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 21, found 20."); # # Upgrade from version 5.5 # diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test index c40bf8b10be..ae1b328e699 100644 --- a/mysql-test/main/mysql_upgrade.test +++ b/mysql-test/main/mysql_upgrade.test @@ -368,6 +368,9 @@ rename table mysql.global_priv_bak to mysql.global_priv; # The warning appears during mysql_upgrade, before the schema becomes consistent call mtr.add_suppression("innodb_table_stats has length mismatch in the column name table_name"); +# This comes from opening 10.6 sys.host_summary view that uses sys.format_time function, +# on still inconsistent mysql.proc, in older versions +call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 21, found 20."); --let $old_version= 5.5 --source include/load_dump_and_upgrade.inc diff --git a/mysql-test/main/mysql_upgrade_mysql_json_datatype.result b/mysql-test/main/mysql_upgrade_mysql_json_datatype.result index 25bc70c9074..cbf2b17175a 100644 --- a/mysql-test/main/mysql_upgrade_mysql_json_datatype.result +++ b/mysql-test/main/mysql_upgrade_mysql_json_datatype.result @@ -44,6 +44,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -53,6 +153,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.mysql_json_test Needs upgrade test.mysql_json_test_big Needs upgrade diff --git a/mysql-test/main/mysql_upgrade_noengine.result b/mysql-test/main/mysql_upgrade_noengine.result index 1b915978a6d..7d2bbca7c43 100644 --- a/mysql-test/main/mysql_upgrade_noengine.result +++ b/mysql-test/main/mysql_upgrade_noengine.result @@ -89,6 +89,106 @@ mysql.transaction_registry OK mysql.user OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -98,6 +198,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.t1 Error : Unknown storage engine 'BLACKHOLE' @@ -182,6 +284,106 @@ mysql.transaction_registry OK mysql.user OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -191,6 +393,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.t1 Error : Unknown storage engine 'BLACKHOLE' @@ -279,6 +483,106 @@ Checking for tables with unknown storage engine installing plugin for 'archive' storage engine installing plugin for 'blackhole' storage engine Phase 3/7: Fixing views +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -288,6 +592,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.t1 OK test.t2 OK diff --git a/mysql-test/main/mysql_upgrade_ssl.result b/mysql-test/main/mysql_upgrade_ssl.result index ff911e9f54b..55ece1269d2 100644 --- a/mysql-test/main/mysql_upgrade_ssl.result +++ b/mysql-test/main/mysql_upgrade_ssl.result @@ -35,6 +35,106 @@ mysql.transaction_registry OK Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -44,6 +144,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/mysql_upgrade_view.result b/mysql-test/main/mysql_upgrade_view.result index d22298c6ed0..597be2e4cb6 100644 --- a/mysql-test/main/mysql_upgrade_view.result +++ b/mysql-test/main/mysql_upgrade_view.result @@ -114,6 +114,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK test.v1 OK test.v1badcheck OK test.v2 OK @@ -127,6 +227,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.kv OK test.t1 OK @@ -264,6 +366,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views from mysql mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK test.v1 OK test.v2 OK test.v3 OK @@ -277,6 +479,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test test.kv OK test.t1 OK @@ -389,6 +593,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views from mysql mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK test.v1 OK test.v2 OK test.v3 OK diff --git a/mysql-test/main/mysqlcheck.result b/mysql-test/main/mysqlcheck.result index 8b6a19b5270..284574cf6da 100644 --- a/mysql-test/main/mysqlcheck.result +++ b/mysql-test/main/mysqlcheck.result @@ -34,6 +34,7 @@ mysql.time_zone_name OK mysql.time_zone_transition OK mysql.time_zone_transition_type OK mysql.transaction_registry OK +sys.sys_config OK mtr.global_suppressions Table is already up to date mtr.test_suppressions Table is already up to date mysql.column_stats OK @@ -70,6 +71,7 @@ mysql.time_zone_transition_type OK mysql.transaction_registry note : Table does not support optimize, doing recreate + analyze instead status : OK +sys.sys_config OK mysql.column_stats OK mysql.columns_priv OK mysql.db OK @@ -465,6 +467,7 @@ warning : Table is marked as crashed warning : Size of datafile is: 4 Should be: 0 error : got error: 0 when reading datafile at record: 0 error : Corrupt +sys.sys_config Table is already up to date test.t2 Table is already up to date Repairing tables diff --git a/mysql-test/main/mysqlslap.result b/mysql-test/main/mysqlslap.result index 791cb5ac6b3..78560903fb7 100644 --- a/mysql-test/main/mysqlslap.result +++ b/mysql-test/main/mysqlslap.result @@ -230,6 +230,7 @@ information_schema mtr mysql performance_schema +sys test # 'bug58090' database should be present. SHOW DATABASES; @@ -239,6 +240,7 @@ information_schema mtr mysql performance_schema +sys test DROP DATABASE bug58090; # diff --git a/mysql-test/main/ps_1general.result b/mysql-test/main/ps_1general.result index 663aeec2e29..149c297621b 100644 --- a/mysql-test/main/ps_1general.result +++ b/mysql-test/main/ps_1general.result @@ -264,6 +264,7 @@ information_schema mtr mysql performance_schema +sys test prepare stmt4 from ' show tables from test like ''t2%'' '; execute stmt4; diff --git a/mysql-test/main/ps_ddl.result b/mysql-test/main/ps_ddl.result index e528252c86f..86a294b732d 100644 --- a/mysql-test/main/ps_ddl.result +++ b/mysql-test/main/ps_ddl.result @@ -769,7 +769,7 @@ deallocate prepare stmt; # # Test 3: View referencing an Information schema table # -create view t1 as select table_name from information_schema.views order by table_name; +create view t1 as select table_name from information_schema.views where table_schema <> 'sys' order by table_name; prepare stmt from "select * from t1"; execute stmt; table_name diff --git a/mysql-test/main/ps_ddl.test b/mysql-test/main/ps_ddl.test index dafb5b5dea3..694ee61fd0c 100644 --- a/mysql-test/main/ps_ddl.test +++ b/mysql-test/main/ps_ddl.test @@ -699,7 +699,7 @@ deallocate prepare stmt; --echo # --echo # Test 3: View referencing an Information schema table --echo # -create view t1 as select table_name from information_schema.views order by table_name; +create view t1 as select table_name from information_schema.views where table_schema <> 'sys' order by table_name; prepare stmt from "select * from t1"; execute stmt; diff --git a/mysql-test/main/schema.result b/mysql-test/main/schema.result index 6d8271a49f3..99ac6c71985 100644 --- a/mysql-test/main/schema.result +++ b/mysql-test/main/schema.result @@ -10,6 +10,7 @@ information_schema mtr mysql performance_schema +sys test drop schema foo; # diff --git a/mysql-test/main/show_check.result b/mysql-test/main/show_check.result index f6ef7b8ccf1..4cc58a74c4a 100644 --- a/mysql-test/main/show_check.result +++ b/mysql-test/main/show_check.result @@ -149,6 +149,7 @@ information_schema mtr mysql performance_schema +sys test show databases like "test%"; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr diff --git a/mysql-test/main/show_function_with_pad_char_to_full_length.result b/mysql-test/main/show_function_with_pad_char_to_full_length.result index 785cab7b3e6..c520fee3ffd 100644 --- a/mysql-test/main/show_function_with_pad_char_to_full_length.result +++ b/mysql-test/main/show_function_with_pad_char_to_full_length.result @@ -1,9 +1,9 @@ create function f() returns int return 1; -show function status; +show function status where db='test'; Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation T f T T T T T T T T T set sql_mode = 'PAD_CHAR_TO_FULL_LENGTH'; -show function status; +show function status where db='test'; Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation T f T T T T T T T T T drop function f; diff --git a/mysql-test/main/show_function_with_pad_char_to_full_length.test b/mysql-test/main/show_function_with_pad_char_to_full_length.test index f47f36294d4..81e82118786 100644 --- a/mysql-test/main/show_function_with_pad_char_to_full_length.test +++ b/mysql-test/main/show_function_with_pad_char_to_full_length.test @@ -6,10 +6,10 @@ create function f() returns int return 1; --replace_column 1 T 3 T 4 T 5 T 6 T 7 T 8 T 9 T 10 T 11 T -show function status; +show function status where db='test'; set sql_mode = 'PAD_CHAR_TO_FULL_LENGTH'; --replace_column 1 T 3 T 4 T 5 T 6 T 7 T 8 T 9 T 10 T 11 T -show function status; +show function status where db='test'; drop function f; select @@sql_mode; diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result index f30283d3b1d..3aff3f7e96f 100644 --- a/mysql-test/main/sp.result +++ b/mysql-test/main/sp.result @@ -1227,12 +1227,12 @@ n f 19 121645100408832000 20 2432902008176640000 drop table t3| -show function status like '%f%'| +show function status where name like '%f%' and Db <> 'sys'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation test fac FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER latin1 latin1_swedish_ci latin1_swedish_ci drop procedure ifac| drop function fac| -show function status like '%f%'| +show function status where name like '%f%' and Db <> 'sys'| Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation drop table if exists t3| create table t3 ( diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test index bf3a70b6283..a909d11bd81 100644 --- a/mysql-test/main/sp.test +++ b/mysql-test/main/sp.test @@ -1456,11 +1456,11 @@ call ifac(20)| select * from t3| drop table t3| --replace_column 4 'root@localhost' 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00' -show function status like '%f%'| +show function status where name like '%f%' and Db <> 'sys'| drop procedure ifac| drop function fac| --replace_column 4 'root@localhost' 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00' -show function status like '%f%'| +show function status where name like '%f%' and Db <> 'sys'| # primes diff --git a/mysql-test/main/sp2.result b/mysql-test/main/sp2.result index 55f3d80f25b..853b45070fd 100644 --- a/mysql-test/main/sp2.result +++ b/mysql-test/main/sp2.result @@ -1,6 +1,6 @@ CREATE DATABASE test1; CREATE PROCEDURE test1.sp3() BEGIN END; -SHOW PROCEDURE STATUS; +SHOW PROCEDURE STATUS WHERE Db <> 'sys'; Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation mtr add_suppression PROCEDURE root@localhost # # DEFINER utf8 utf8_general_ci latin1_swedish_ci mtr check_testcase PROCEDURE root@localhost # # DEFINER utf8 utf8_general_ci latin1_swedish_ci diff --git a/mysql-test/main/sp2.test b/mysql-test/main/sp2.test index a638bf1e706..6227f8d7371 100644 --- a/mysql-test/main/sp2.test +++ b/mysql-test/main/sp2.test @@ -17,7 +17,7 @@ CREATE DATABASE test1; CREATE PROCEDURE test1.sp3() BEGIN END; --replace_column 5 # 6 # -SHOW PROCEDURE STATUS; +SHOW PROCEDURE STATUS WHERE Db <> 'sys'; # Cleanup DROP PROCEDURE sp2; diff --git a/mysql-test/main/upgrade_MDEV-19650.result b/mysql-test/main/upgrade_MDEV-19650.result index 7e8610683e2..bc0ff17028f 100644 --- a/mysql-test/main/upgrade_MDEV-19650.result +++ b/mysql-test/main/upgrade_MDEV-19650.result @@ -136,6 +136,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -149,6 +249,8 @@ mysqltest1.save_global_priv OK mysqltest1.save_proxies_priv OK mysqltest1.save_tables_priv OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/upgrade_MDEV-23102-1.result b/mysql-test/main/upgrade_MDEV-23102-1.result index 8caa49180ee..35bcc41bc33 100644 --- a/mysql-test/main/upgrade_MDEV-23102-1.result +++ b/mysql-test/main/upgrade_MDEV-23102-1.result @@ -156,6 +156,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -169,6 +269,8 @@ mysqltest1.save_global_priv OK mysqltest1.save_proxies_priv OK mysqltest1.save_tables_priv OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -252,6 +354,106 @@ Error : Unknown storage engine 'InnoDB' error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -265,6 +467,8 @@ mysqltest1.save_global_priv OK mysqltest1.save_proxies_priv OK mysqltest1.save_tables_priv OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/upgrade_MDEV-23102-2.result b/mysql-test/main/upgrade_MDEV-23102-2.result index 4702fae812f..c6d4aaf31a9 100644 --- a/mysql-test/main/upgrade_MDEV-23102-2.result +++ b/mysql-test/main/upgrade_MDEV-23102-2.result @@ -140,6 +140,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -153,6 +253,8 @@ mysqltest1.save_global_priv OK mysqltest1.save_proxies_priv OK mysqltest1.save_tables_priv OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK @@ -228,6 +330,106 @@ Error : Unknown storage engine 'InnoDB' error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -241,6 +443,8 @@ mysqltest1.save_global_priv OK mysqltest1.save_proxies_priv OK mysqltest1.save_tables_priv OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/upgrade_mdev_24363.result b/mysql-test/main/upgrade_mdev_24363.result index d507193088e..50fc2d7bcc3 100644 --- a/mysql-test/main/upgrade_mdev_24363.result +++ b/mysql-test/main/upgrade_mdev_24363.result @@ -100,6 +100,106 @@ error : Corrupt Phase 2/7: Installing used storage engines... Skipped Phase 3/7: Fixing views mysql.user OK +sys.host_summary OK +sys.host_summary_by_file_io OK +sys.host_summary_by_file_io_type OK +sys.host_summary_by_stages OK +sys.host_summary_by_statement_latency OK +sys.host_summary_by_statement_type OK +sys.innodb_buffer_stats_by_schema OK +sys.innodb_buffer_stats_by_table OK +sys.innodb_lock_waits OK +sys.io_by_thread_by_latency OK +sys.io_global_by_file_by_bytes OK +sys.io_global_by_file_by_latency OK +sys.io_global_by_wait_by_bytes OK +sys.io_global_by_wait_by_latency OK +sys.latest_file_io OK +sys.memory_by_host_by_current_bytes OK +sys.memory_by_thread_by_current_bytes OK +sys.memory_by_user_by_current_bytes OK +sys.memory_global_by_current_bytes OK +sys.memory_global_total OK +sys.metrics OK +sys.processlist OK +sys.ps_check_lost_instrumentation OK +sys.schema_auto_increment_columns OK +sys.schema_index_statistics OK +sys.schema_object_overview OK +sys.schema_redundant_indexes OK +sys.schema_table_lock_waits OK +sys.schema_table_statistics OK +sys.schema_table_statistics_with_buffer OK +sys.schema_tables_with_full_table_scans OK +sys.schema_unused_indexes OK +sys.session OK +sys.session_ssl_status OK +sys.statement_analysis OK +sys.statements_with_errors_or_warnings OK +sys.statements_with_full_table_scans OK +sys.statements_with_runtimes_in_95th_percentile OK +sys.statements_with_sorting OK +sys.statements_with_temp_tables OK +sys.user_summary OK +sys.user_summary_by_file_io OK +sys.user_summary_by_file_io_type OK +sys.user_summary_by_stages OK +sys.user_summary_by_statement_latency OK +sys.user_summary_by_statement_type OK +sys.version OK +sys.wait_classes_global_by_avg_latency OK +sys.wait_classes_global_by_latency OK +sys.waits_by_host_by_latency OK +sys.waits_by_user_by_latency OK +sys.waits_global_by_latency OK +sys.x$host_summary OK +sys.x$host_summary_by_file_io OK +sys.x$host_summary_by_file_io_type OK +sys.x$host_summary_by_stages OK +sys.x$host_summary_by_statement_latency OK +sys.x$host_summary_by_statement_type OK +sys.x$innodb_buffer_stats_by_schema OK +sys.x$innodb_buffer_stats_by_table OK +sys.x$innodb_lock_waits OK +sys.x$io_by_thread_by_latency OK +sys.x$io_global_by_file_by_bytes OK +sys.x$io_global_by_file_by_latency OK +sys.x$io_global_by_wait_by_bytes OK +sys.x$io_global_by_wait_by_latency OK +sys.x$latest_file_io OK +sys.x$memory_by_host_by_current_bytes OK +sys.x$memory_by_thread_by_current_bytes OK +sys.x$memory_by_user_by_current_bytes OK +sys.x$memory_global_by_current_bytes OK +sys.x$memory_global_total OK +sys.x$processlist OK +sys.x$ps_digest_95th_percentile_by_avg_us OK +sys.x$ps_digest_avg_latency_distribution OK +sys.x$ps_schema_table_statistics_io OK +sys.x$schema_flattened_keys OK +sys.x$schema_index_statistics OK +sys.x$schema_table_lock_waits OK +sys.x$schema_table_statistics OK +sys.x$schema_table_statistics_with_buffer OK +sys.x$schema_tables_with_full_table_scans OK +sys.x$session OK +sys.x$statement_analysis OK +sys.x$statements_with_errors_or_warnings OK +sys.x$statements_with_full_table_scans OK +sys.x$statements_with_runtimes_in_95th_percentile OK +sys.x$statements_with_sorting OK +sys.x$statements_with_temp_tables OK +sys.x$user_summary OK +sys.x$user_summary_by_file_io OK +sys.x$user_summary_by_file_io_type OK +sys.x$user_summary_by_stages OK +sys.x$user_summary_by_statement_latency OK +sys.x$user_summary_by_statement_type OK +sys.x$wait_classes_global_by_avg_latency OK +sys.x$wait_classes_global_by_latency OK +sys.x$waits_by_host_by_latency OK +sys.x$waits_by_user_by_latency OK +sys.x$waits_global_by_latency OK Phase 4/7: Running 'mysql_fix_privilege_tables' Phase 5/7: Fixing table and database names Phase 6/7: Checking and upgrading tables @@ -109,6 +209,8 @@ mtr mtr.global_suppressions OK mtr.test_suppressions OK performance_schema +sys +sys.sys_config OK test Phase 7/7: Running 'FLUSH PRIVILEGES' OK diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index 35e607ad43c..d9bb83ba782 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -610,7 +610,7 @@ insert into t1 values(5,'Hello, world of views'); create view v1 as select * from t1; create view v2 as select * from v1; update v2 set col2='Hello, view world'; -select is_updatable from information_schema.views; +select is_updatable from information_schema.views where table_schema <> 'sys'; is_updatable YES YES diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index 78ab6a98ebb..46a71f0a326 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -500,7 +500,7 @@ insert into t1 values(5,'Hello, world of views'); create view v1 as select * from t1; create view v2 as select * from v1; update v2 set col2='Hello, view world'; -select is_updatable from information_schema.views; +select is_updatable from information_schema.views where table_schema <> 'sys'; select * from t1; drop view v2, v1; drop table t1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index bda7750a598..bd64d101fab 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1730,8 +1730,15 @@ sub collect_mysqld_features { # Enable or disable ARCHIVE plugin. Possible values are ON, OFF, # FORCE (don't start if the plugin fails to load), # FORCE_PLUS_PERMANENT (like FORCE, but the plugin can not be uninstalled). + # For Innodb I_S plugins that are referenced in sys schema + # do not make them optional, to prevent diffs in tests. push @optional_plugins, $1 - if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. One of: ON, OFF, FORCE/; + if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. One of: ON, OFF, FORCE/ + and $1 ne "innodb-metrics" + and $1 ne "innodb-buffer-page" + and $1 ne "innodb-lock-waits" + and $1 ne "innodb-locks" + and $1 ne "innodb-trx"; next; } @@ -3090,6 +3097,9 @@ sub mysql_install_db { mtr_appendfile_to_file("$sql_dir/fill_help_tables.sql", $bootstrap_sql_file); + # Append sys schema + mtr_appendfile_to_file("$gis_sp_path/mysql_sys_schema.sql", + $bootstrap_sql_file); # Create test database mtr_appendfile_to_file("$sql_dir/mysql_test_db.sql", $bootstrap_sql_file); diff --git a/mysql-test/suite/binlog/r/binlog_database.result b/mysql-test/suite/binlog/r/binlog_database.result index 2661b344cad..3a3221dfb94 100644 --- a/mysql-test/suite/binlog/r/binlog_database.result +++ b/mysql-test/suite/binlog/r/binlog_database.result @@ -292,4 +292,5 @@ information_schema mtr mysql performance_schema +sys test 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 ad0cf41bdf1..f42928d66f9 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 @@ -49,6 +49,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -58,6 +59,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -68,6 +70,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -77,6 +80,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -87,6 +91,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -96,6 +101,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -106,6 +112,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -115,6 +122,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -125,6 +133,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -134,6 +143,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -144,6 +154,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -153,6 +164,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -163,6 +175,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -172,6 +185,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -182,6 +196,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -191,6 +206,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -201,6 +217,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -210,6 +227,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -220,6 +238,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -229,6 +248,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -239,6 +259,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -248,6 +269,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -258,6 +280,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -267,6 +290,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -277,6 +301,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -286,6 +311,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -296,6 +322,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -305,6 +332,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -315,6 +343,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -324,6 +353,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -334,6 +364,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -343,6 +374,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -353,6 +385,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -362,6 +395,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -372,6 +406,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -381,6 +416,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -391,6 +427,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -400,6 +437,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d8; CREATE DATABASE d8; @@ -410,6 +448,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -419,5 +458,6 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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 d01b85d9039..d3e86c6649f 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 @@ -7,6 +7,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -16,6 +17,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -26,6 +28,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -35,6 +38,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -45,6 +49,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -54,6 +59,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -64,6 +70,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -73,6 +80,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -83,6 +91,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -92,6 +101,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -102,6 +112,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -111,5 +122,6 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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 0b06979ee1d..7a809529f59 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 @@ -331,6 +331,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -340,6 +341,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d9; CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; @@ -350,6 +352,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -359,6 +362,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d9; CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; @@ -369,6 +373,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -378,6 +383,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d9; CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; @@ -388,6 +394,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -397,6 +404,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d9; CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; @@ -407,6 +415,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -416,6 +425,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d9; CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; @@ -426,6 +436,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -435,6 +446,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d9; CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; @@ -445,6 +457,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -454,6 +467,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d9; CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; @@ -464,6 +478,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -473,5 +488,6 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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 1b875962417..852e9066761 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 @@ -331,6 +331,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -340,6 +341,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -350,6 +352,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -359,6 +362,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -369,6 +373,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -378,6 +383,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -388,6 +394,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -397,6 +404,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -407,6 +415,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -416,6 +425,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -426,6 +436,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -435,6 +446,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -445,6 +457,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -454,6 +467,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -464,6 +478,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -473,6 +488,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -483,6 +499,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -492,6 +509,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -502,6 +520,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -511,6 +530,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -521,6 +541,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -530,6 +551,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -540,6 +562,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -549,6 +572,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -559,6 +583,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -568,6 +593,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -578,6 +604,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -587,6 +614,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -597,6 +625,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -606,6 +635,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -616,6 +646,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -625,6 +656,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -635,6 +667,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -644,6 +677,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -654,6 +688,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -663,6 +698,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -673,6 +709,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -682,6 +719,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -692,6 +730,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -701,6 +740,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -711,6 +751,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -720,6 +761,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -730,6 +772,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -739,6 +782,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -749,6 +793,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -758,6 +803,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -768,6 +814,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -777,6 +824,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -787,6 +835,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -796,6 +845,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -806,6 +856,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -815,6 +866,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -825,6 +877,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -834,6 +887,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -844,6 +898,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -853,6 +908,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -863,6 +919,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -872,6 +929,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -882,6 +940,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -891,6 +950,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -901,6 +961,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -910,6 +971,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -920,6 +982,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -929,6 +992,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -939,6 +1003,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -948,6 +1013,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -958,6 +1024,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -967,6 +1034,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -977,6 +1045,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -986,6 +1055,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -996,6 +1066,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1005,6 +1076,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1015,6 +1087,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1024,6 +1097,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1034,6 +1108,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1043,6 +1118,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1053,6 +1129,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1062,6 +1139,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1072,6 +1150,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1081,6 +1160,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1091,6 +1171,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1100,6 +1181,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1110,6 +1192,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1119,6 +1202,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1129,6 +1213,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1138,6 +1223,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1148,6 +1234,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1157,6 +1244,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1167,6 +1255,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1176,6 +1265,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1186,6 +1276,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1195,6 +1286,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1205,6 +1297,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1214,6 +1307,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1224,6 +1318,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1233,6 +1328,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1243,6 +1339,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1252,6 +1349,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1262,6 +1360,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1271,6 +1370,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1281,6 +1381,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1290,6 +1391,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1300,6 +1402,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1309,6 +1412,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1319,6 +1423,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1328,6 +1433,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1338,6 +1444,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1347,6 +1454,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1357,6 +1465,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1366,6 +1475,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1376,6 +1486,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1385,6 +1496,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1395,6 +1507,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1404,6 +1517,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1414,6 +1528,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1423,6 +1538,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1433,6 +1549,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1442,6 +1559,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1452,6 +1570,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1461,6 +1580,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1471,6 +1591,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1480,6 +1601,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1490,6 +1612,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1499,6 +1622,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1509,6 +1633,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1518,6 +1643,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1528,6 +1654,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1537,6 +1664,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1547,6 +1675,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1556,6 +1685,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1566,6 +1696,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1575,6 +1706,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1585,6 +1717,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1594,6 +1727,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1604,6 +1738,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1613,6 +1748,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1623,6 +1759,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1632,6 +1769,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1642,6 +1780,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1651,6 +1790,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1661,6 +1801,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1670,6 +1811,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1680,6 +1822,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1689,6 +1832,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1699,6 +1843,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1708,6 +1853,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1718,6 +1864,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1727,6 +1874,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1737,6 +1885,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1746,6 +1895,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1756,6 +1906,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1765,6 +1916,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1775,6 +1927,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1784,6 +1937,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1794,6 +1948,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1803,6 +1958,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1813,6 +1969,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1822,6 +1979,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1832,6 +1990,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1841,6 +2000,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1851,6 +2011,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1860,6 +2021,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1870,6 +2032,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1879,6 +2042,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1889,6 +2053,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1898,6 +2063,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d10; CREATE DATABASE d10 DEFAULT CHARACTER SET utf8; @@ -1908,6 +2074,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -1917,5 +2084,6 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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 3c3d99bfba2..445e309effe 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 @@ -7,6 +7,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d12; CREATE DATABASE d12 CHARACTER SET utf8; @@ -17,6 +18,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d12; CREATE DATABASE d12 CHARACTER SET binary; @@ -27,6 +29,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d12; CREATE DATABASE d12 CHARACTER SET swe7; @@ -37,6 +40,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d12; CREATE DATABASE d12 CHARACTER SET cp1251; @@ -47,6 +51,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP DATABASE d12; CREATE SCHEMA d12 CHARACTER SET ascii; @@ -57,6 +62,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP SCHEMA d12; CREATE SCHEMA d12 CHARACTER SET utf8; @@ -67,6 +73,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP SCHEMA d12; CREATE SCHEMA d12 CHARACTER SET binary; @@ -77,6 +84,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP SCHEMA d12; CREATE SCHEMA d12 CHARACTER SET swe7; @@ -87,6 +95,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP SCHEMA d12; CREATE SCHEMA d12 CHARACTER SET cp1251; @@ -97,5 +106,6 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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 236973a34fd..85fe4014b39 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 @@ -7,6 +7,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -17,6 +18,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -27,6 +29,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -37,6 +40,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -47,6 +51,7 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys 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; @@ -57,5 +62,6 @@ def information_schema utf8 utf8_general_ci NULL def mtr latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL def performance_schema utf8 utf8_general_ci NULL +def sys utf8 utf8_general_ci NULL def test latin1 latin1_swedish_ci NULL DROP SCHEMA d13; diff --git a/mysql-test/suite/engines/funcs/r/db_create_drop.result b/mysql-test/suite/engines/funcs/r/db_create_drop.result index 85a871cf135..908327be8e7 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_drop.result +++ b/mysql-test/suite/engines/funcs/r/db_create_drop.result @@ -7,6 +7,7 @@ information_schema mtr mysql performance_schema +sys test SHOW DATABASES LIKE 'd%'; Database (d%) @@ -18,6 +19,7 @@ information_schema mtr mysql performance_schema +sys test USE d1; DROP DATABASE d1; @@ -29,6 +31,7 @@ information_schema mtr mysql performance_schema +sys test SHOW SCHEMAS LIKE 'd%'; Database (d%) @@ -40,6 +43,7 @@ information_schema mtr mysql performance_schema +sys test USE d1; DROP SCHEMA d1; diff --git a/mysql-test/suite/engines/funcs/r/db_create_error.result b/mysql-test/suite/engines/funcs/r/db_create_error.result index d18fe7ee5fd..3b7934a140a 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_error.result +++ b/mysql-test/suite/engines/funcs/r/db_create_error.result @@ -7,6 +7,7 @@ information_schema mtr mysql performance_schema +sys test CREATE DATABASE d4; ERROR HY000: Can't create database 'd4'; database exists @@ -17,4 +18,5 @@ information_schema mtr mysql performance_schema +sys test diff --git a/mysql-test/suite/engines/funcs/r/db_create_error_reserved.result b/mysql-test/suite/engines/funcs/r/db_create_error_reserved.result index 571ac0ea1ff..066209c39c9 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_error_reserved.result +++ b/mysql-test/suite/engines/funcs/r/db_create_error_reserved.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test CREATE DATABASE mysql; ERROR HY000: Can't create database 'mysql'; database exists @@ -13,4 +14,5 @@ information_schema mtr mysql performance_schema +sys test diff --git a/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result b/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result index 2637087da5b..0a4c54622d0 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result +++ b/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result @@ -10,6 +10,7 @@ information_schema mtr mysql performance_schema +sys test USE d2; DROP DATABASE d2; @@ -27,6 +28,7 @@ information_schema mtr mysql performance_schema +sys test USE d2; DROP SCHEMA d2; diff --git a/mysql-test/suite/engines/funcs/r/db_drop_error.result b/mysql-test/suite/engines/funcs/r/db_drop_error.result index 24a51768103..a5dc1f8ed31 100644 --- a/mysql-test/suite/engines/funcs/r/db_drop_error.result +++ b/mysql-test/suite/engines/funcs/r/db_drop_error.result @@ -7,6 +7,7 @@ information_schema mtr mysql performance_schema +sys test DROP DATABASE nond5; ERROR HY000: Can't drop database 'nond5'; database doesn't exist @@ -17,4 +18,5 @@ information_schema mtr mysql performance_schema +sys test diff --git a/mysql-test/suite/engines/funcs/r/db_use_error.result b/mysql-test/suite/engines/funcs/r/db_use_error.result index c2fce4f0acf..a7c76e69b0d 100644 --- a/mysql-test/suite/engines/funcs/r/db_use_error.result +++ b/mysql-test/suite/engines/funcs/r/db_use_error.result @@ -7,6 +7,7 @@ information_schema mtr mysql performance_schema +sys test USE DATABASE nond6; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'DATABASE nond6' at line 1 @@ -17,4 +18,5 @@ information_schema mtr mysql performance_schema +sys test diff --git a/mysql-test/suite/funcs_1/datadict/is_routines.inc b/mysql-test/suite/funcs_1/datadict/is_routines.inc index 35b31c35553..3bbd26a948d 100644 --- a/mysql-test/suite/funcs_1/datadict/is_routines.inc +++ b/mysql-test/suite/funcs_1/datadict/is_routines.inc @@ -185,17 +185,17 @@ FLUSH PRIVILEGES; --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK connect (testuser1, localhost, testuser1, , db_datadict); --replace_column 24 "YYYY-MM-DD hh:mm:ss" 25 "YYYY-MM-DD hh:mm:ss" -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK connect (testuser2, localhost, testuser2, , db_datadict); --replace_column 24 "YYYY-MM-DD hh:mm:ss" 25 "YYYY-MM-DD hh:mm:ss" -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK connect (testuser3, localhost, testuser3, , test); --replace_column 24 "YYYY-MM-DD hh:mm:ss" 25 "YYYY-MM-DD hh:mm:ss" -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; # Cleanup connection default; diff --git a/mysql-test/suite/funcs_1/datadict/is_views.inc b/mysql-test/suite/funcs_1/datadict/is_views.inc index cb3444e308a..367b1b1ede4 100644 --- a/mysql-test/suite/funcs_1/datadict/is_views.inc +++ b/mysql-test/suite/funcs_1/datadict/is_views.inc @@ -65,9 +65,9 @@ eval SHOW COLUMNS FROM information_schema.$is_table; # Note: Retrieval of information within information_schema.columns about # information_schema.views is in is_columns_is.test. -# Show that TABLE_CATALOG is always NULL. +# Show that TABLE_CATALOG is always 'def'. SELECT table_catalog, table_schema, table_name -FROM information_schema.views WHERE table_catalog IS NOT NULL; +FROM information_schema.views WHERE table_catalog <> 'def'; --echo ################################################################################ diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result index 2bc3f46821d..36115ecad83 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result @@ -202,7 +202,7 @@ update t1 set f2='update 3.5.1.7'; select * from t1; f1 f2 f3 NULL update 3.5.1.7 42 -select trigger_name from information_schema.triggers order by trigger_name; +select trigger_name from information_schema.triggers where trigger_schema <> 'sys' order by trigger_name; trigger_name gs_insert trg5_1 diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result index efb67e32cee..3eeb2a39f4a 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result @@ -144,6 +144,7 @@ def mysql PRIMARY def mysql time_zone_transition_type Time_zone_id def mysql PRIMARY def mysql time_zone_transition_type Transition_type_id def mysql commit_id def mysql transaction_registry commit_id def mysql PRIMARY def mysql transaction_registry transaction_id +def sys PRIMARY def sys sys_config variable ######################################################################################## # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.KEY_COLUMN_USAGE accessible information ######################################################################################## diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result index cf67be8f7a0..2c772b0334b 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result @@ -144,6 +144,7 @@ def mysql PRIMARY def mysql time_zone_transition_type Time_zone_id def mysql PRIMARY def mysql time_zone_transition_type Transition_type_id def mysql commit_id def mysql transaction_registry commit_id def mysql PRIMARY def mysql transaction_registry transaction_id +def sys PRIMARY def sys sys_config variable ######################################################################################## # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.KEY_COLUMN_USAGE accessible information ######################################################################################## diff --git a/mysql-test/suite/funcs_1/r/is_routines.result b/mysql-test/suite/funcs_1/r/is_routines.result index 5f8e965de84..706ea7f623c 100644 --- a/mysql-test/suite/funcs_1/r/is_routines.result +++ b/mysql-test/suite/funcs_1/r/is_routines.result @@ -188,16 +188,16 @@ TO 'testuser2'@'localhost'; GRANT EXECUTE ON db_datadict_2.* TO 'testuser2'@'localhost'; FLUSH PRIVILEGES; connect testuser1, localhost, testuser1, , db_datadict; -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION sp_6_408002_1 def db_datadict sp_6_408002_1 PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL NULL NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL NULL NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci connect testuser2, localhost, testuser2, , db_datadict; -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL NULL NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci connect testuser3, localhost, testuser3, , test; -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION connection default; disconnect testuser1; diff --git a/mysql-test/suite/funcs_1/r/is_routines_embedded.result b/mysql-test/suite/funcs_1/r/is_routines_embedded.result index 983ad198052..002ff2915d4 100644 --- a/mysql-test/suite/funcs_1/r/is_routines_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_routines_embedded.result @@ -188,7 +188,7 @@ TO 'testuser2'@'localhost'; GRANT EXECUTE ON db_datadict_2.* TO 'testuser2'@'localhost'; FLUSH PRIVILEGES; connect testuser1, localhost, testuser1, , db_datadict; -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION sp_6_408002_1 def db_datadict sp_6_408002_1 PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM db_datadict.res_6_408002_1; @@ -197,14 +197,14 @@ sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NUL SELECT * FROM db_datadict_2.res_6_408002_2; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci add_suppression def mtr add_suppression PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN INSERT INTO test_suppressions (pattern) VALUES (pattern); FLUSH NO_WRITE_TO_BINLOG TABLE test_suppressions; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci -check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' AND variable_name != 'THREAD_POOL_SIZE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.global_priv; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci +check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' AND variable_name != 'THREAD_POOL_SIZE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert') AND TRIGGER_SCHEMA != 'sys'; SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA != 'sys'; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.plugin, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.global_priv; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci check_warnings def mtr check_warnings PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN DECLARE `pos` bigint unsigned; SET SQL_LOG_BIN=0, SQL_SAFE_UPDATES=0; UPDATE error_log el, global_suppressions gs SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP gs.pattern; UPDATE error_log el, test_suppressions ts SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP ts.pattern; SELECT COUNT(*) INTO @num_warnings FROM error_log WHERE suspicious=1; IF @num_warnings > 0 THEN SELECT line FROM error_log WHERE suspicious=1; SELECT 2 INTO result; ELSE SELECT 0 INTO RESULT; END IF; TRUNCATE test_suppressions; DROP TABLE error_log; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci AddGeometryColumn def mysql AddGeometryColumn PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL begin set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' ADD ', geometry_column,' GEOMETRY REF_SYSTEM_ID=', t_srid); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end NULL NULL SQL NO CONTAINS SQL NULL INVOKER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss mariadb.sys@localhost latin1 latin1_swedish_ci latin1_swedish_ci DropGeometryColumn def mysql DropGeometryColumn PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL begin set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' DROP ', geometry_column); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end NULL NULL SQL NO CONTAINS SQL NULL INVOKER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss mariadb.sys@localhost latin1 latin1_swedish_ci latin1_swedish_ci connect testuser2, localhost, testuser2, , db_datadict; -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION sp_6_408002_1 def db_datadict sp_6_408002_1 PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM db_datadict.res_6_408002_1; @@ -213,14 +213,14 @@ sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NUL SELECT * FROM db_datadict_2.res_6_408002_2; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci add_suppression def mtr add_suppression PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN INSERT INTO test_suppressions (pattern) VALUES (pattern); FLUSH NO_WRITE_TO_BINLOG TABLE test_suppressions; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci -check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' AND variable_name != 'THREAD_POOL_SIZE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.global_priv; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci +check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' AND variable_name != 'THREAD_POOL_SIZE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert') AND TRIGGER_SCHEMA != 'sys'; SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA != 'sys'; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.plugin, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.global_priv; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci check_warnings def mtr check_warnings PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN DECLARE `pos` bigint unsigned; SET SQL_LOG_BIN=0, SQL_SAFE_UPDATES=0; UPDATE error_log el, global_suppressions gs SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP gs.pattern; UPDATE error_log el, test_suppressions ts SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP ts.pattern; SELECT COUNT(*) INTO @num_warnings FROM error_log WHERE suspicious=1; IF @num_warnings > 0 THEN SELECT line FROM error_log WHERE suspicious=1; SELECT 2 INTO result; ELSE SELECT 0 INTO RESULT; END IF; TRUNCATE test_suppressions; DROP TABLE error_log; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci AddGeometryColumn def mysql AddGeometryColumn PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL begin set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' ADD ', geometry_column,' GEOMETRY REF_SYSTEM_ID=', t_srid); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end NULL NULL SQL NO CONTAINS SQL NULL INVOKER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss mariadb.sys@localhost latin1 latin1_swedish_ci latin1_swedish_ci DropGeometryColumn def mysql DropGeometryColumn PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL begin set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' DROP ', geometry_column); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end NULL NULL SQL NO CONTAINS SQL NULL INVOKER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss mariadb.sys@localhost latin1 latin1_swedish_ci latin1_swedish_ci connect testuser3, localhost, testuser3, , test; -SELECT * FROM information_schema.routines; +SELECT * FROM information_schema.routines where routine_schema <> 'sys'; SPECIFIC_NAME ROUTINE_CATALOG ROUTINE_SCHEMA ROUTINE_NAME ROUTINE_TYPE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME DTD_IDENTIFIER ROUTINE_BODY ROUTINE_DEFINITION EXTERNAL_NAME EXTERNAL_LANGUAGE PARAMETER_STYLE IS_DETERMINISTIC SQL_DATA_ACCESS SQL_PATH SECURITY_TYPE CREATED LAST_ALTERED SQL_MODE ROUTINE_COMMENT DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION sp_6_408002_1 def db_datadict sp_6_408002_1 PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM db_datadict.res_6_408002_1; @@ -229,7 +229,7 @@ sp_6_408002_2 def db_datadict_2 sp_6_408002_2 PROCEDURE NULL NULL NULL NULL NUL SELECT * FROM db_datadict_2.res_6_408002_2; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost latin1 latin1_swedish_ci latin1_swedish_ci add_suppression def mtr add_suppression PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN INSERT INTO test_suppressions (pattern) VALUES (pattern); FLUSH NO_WRITE_TO_BINLOG TABLE test_suppressions; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci -check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' AND variable_name != 'THREAD_POOL_SIZE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); SELECT * FROM INFORMATION_SCHEMA.ROUTINES; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.plugin, mysql.proc, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.global_priv; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci +check_testcase def mtr check_testcase PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' AND variable_name != 'THREAD_POOL_SIZE' ORDER BY variable_name; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY BINARY SCHEMA_NAME; SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('mtr_wsrep_notify', 'wsrep_schema') ORDER BY BINARY SCHEMA_NAME; SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='test'; SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema='mysql' ORDER BY columns_in_mysql; SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert') AND TRIGGER_SCHEMA != 'sys'; SELECT * FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE_SCHEMA != 'sys'; SHOW STATUS LIKE 'slave_open_temp_tables'; checksum table mysql.columns_priv, mysql.db, mysql.func, mysql.help_category, mysql.help_keyword, mysql.help_relation, mysql.plugin, mysql.procs_priv, mysql.roles_mapping, mysql.tables_priv, mysql.time_zone, mysql.time_zone_leap_second, mysql.time_zone_name, mysql.time_zone_transition, mysql.time_zone_transition_type, mysql.global_priv; SELECT * FROM INFORMATION_SCHEMA.PLUGINS; select * from information_schema.session_variables where variable_name = 'debug_sync'; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci check_warnings def mtr check_warnings PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL BEGIN DECLARE `pos` bigint unsigned; SET SQL_LOG_BIN=0, SQL_SAFE_UPDATES=0; UPDATE error_log el, global_suppressions gs SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP gs.pattern; UPDATE error_log el, test_suppressions ts SET suspicious=0 WHERE el.suspicious=1 AND el.line REGEXP ts.pattern; SELECT COUNT(*) INTO @num_warnings FROM error_log WHERE suspicious=1; IF @num_warnings > 0 THEN SELECT line FROM error_log WHERE suspicious=1; SELECT 2 INTO result; ELSE SELECT 0 INTO RESULT; END IF; TRUNCATE test_suppressions; DROP TABLE error_log; END NULL NULL SQL NO CONTAINS SQL NULL DEFINER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss root@localhost utf8 utf8_general_ci latin1_swedish_ci AddGeometryColumn def mysql AddGeometryColumn PROCEDURE NULL NULL NULL NULL NULL NULL NULL NULL SQL begin set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' ADD ', geometry_column,' GEOMETRY REF_SYSTEM_ID=', t_srid); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end NULL NULL SQL NO CONTAINS SQL NULL INVOKER YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss mariadb.sys@localhost latin1 latin1_swedish_ci latin1_swedish_ci diff --git a/mysql-test/suite/funcs_1/r/is_schemata.result b/mysql-test/suite/funcs_1/r/is_schemata.result index 18ee8d01147..f10187ed35a 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata.result +++ b/mysql-test/suite/funcs_1/r/is_schemata.result @@ -61,6 +61,7 @@ def information_schema NULL def mtr NULL def mysql NULL def performance_schema NULL +def sys NULL def test NULL ############################################################################### # Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information diff --git a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result index 6cd93190efd..bb874c23cb7 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result @@ -61,6 +61,7 @@ def information_schema NULL def mtr NULL def mysql NULL def performance_schema NULL +def sys NULL def test NULL ############################################################################### # Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result index 4c67ee81564..bd1eb2de37c 100644 --- a/mysql-test/suite/funcs_1/r/is_statistics.result +++ b/mysql-test/suite/funcs_1/r/is_statistics.result @@ -154,6 +154,7 @@ def mysql time_zone_transition mysql PRIMARY def mysql time_zone_transition mysql PRIMARY def mysql time_zone_transition_type mysql PRIMARY def mysql time_zone_transition_type mysql PRIMARY +def sys sys_config sys PRIMARY Warnings: Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB' diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result index cf0e2ea0191..17def66bcc6 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result @@ -91,6 +91,7 @@ def mysql PRIMARY mysql time_zone_transition def mysql PRIMARY mysql time_zone_transition_type def mysql commit_id mysql transaction_registry def mysql PRIMARY mysql transaction_registry +def sys PRIMARY sys sys_config ######################################################################################### # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.TABLE_CONSTRAINTS accessible information ######################################################################################### diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result index d9ba88cba5a..6cfcd1718fe 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers.result +++ b/mysql-test/suite/funcs_1/r/is_triggers.result @@ -110,6 +110,16 @@ ORDER BY trigger_schema, trigger_name; TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci +def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN + IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN + SET NEW.set_by = USER(); + END IF; +END ROW BEFORE NULL NULL OLD NEW # root@localhost utf8 utf8_general_ci utf8_general_ci +def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN + IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN + SET NEW.set_by = USER(); + END IF; +END ROW BEFORE NULL NULL OLD NEW # root@localhost utf8 utf8_general_ci utf8_general_ci ################################################################################## # Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information ################################################################################## diff --git a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result index 6ec9e7868ce..c5186fb1004 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result @@ -110,6 +110,16 @@ ORDER BY trigger_schema, trigger_name; TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci +def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN + IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN + SET NEW.set_by = USER(); + END IF; +END ROW BEFORE NULL NULL OLD NEW # root@localhost utf8 utf8_general_ci utf8_general_ci +def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN + IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN + SET NEW.set_by = USER(); + END IF; +END ROW BEFORE NULL NULL OLD NEW # root@localhost utf8 utf8_general_ci utf8_general_ci ################################################################################## # Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information ################################################################################## diff --git a/mysql-test/suite/funcs_1/r/is_views.result b/mysql-test/suite/funcs_1/r/is_views.result index e6a2715bbb3..6c948ea667b 100644 --- a/mysql-test/suite/funcs_1/r/is_views.result +++ b/mysql-test/suite/funcs_1/r/is_views.result @@ -68,9 +68,8 @@ CHARACTER_SET_CLIENT varchar(32) NO COLLATION_CONNECTION varchar(32) NO ALGORITHM varchar(10) NO SELECT table_catalog, table_schema, table_name -FROM information_schema.views WHERE table_catalog IS NOT NULL; +FROM information_schema.views WHERE table_catalog <> 'def'; table_catalog table_schema table_name -def mysql user ################################################################################ # Testcase 3.2.13.2 + 3.2.13.3: INFORMATION_SCHEMA.VIEWS accessible information ################################################################################ diff --git a/mysql-test/suite/funcs_1/r/is_views_embedded.result b/mysql-test/suite/funcs_1/r/is_views_embedded.result index cc6ade7daaf..6a628c95bda 100644 --- a/mysql-test/suite/funcs_1/r/is_views_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_views_embedded.result @@ -68,9 +68,8 @@ CHARACTER_SET_CLIENT varchar(32) NO COLLATION_CONNECTION varchar(32) NO ALGORITHM varchar(10) NO SELECT table_catalog, table_schema, table_name -FROM information_schema.views WHERE table_catalog IS NOT NULL; +FROM information_schema.views WHERE table_catalog <> 'def'; table_catalog table_schema table_name -def mysql user ################################################################################ # Testcase 3.2.13.2 + 3.2.13.3: INFORMATION_SCHEMA.VIEWS accessible information ################################################################################ diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result index fa35ef6e7ae..4608fc8302a 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result @@ -203,7 +203,7 @@ update t1 set f2='update 3.5.1.7'; select * from t1; f1 f2 f3 NULL update 3.5.1.7 42 -select trigger_name from information_schema.triggers order by trigger_name; +select trigger_name from information_schema.triggers where trigger_schema <> 'sys' order by trigger_name; trigger_name gs_insert trg5_1 diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result index fa35ef6e7ae..4608fc8302a 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result @@ -203,7 +203,7 @@ update t1 set f2='update 3.5.1.7'; select * from t1; f1 f2 f3 NULL update 3.5.1.7 42 -select trigger_name from information_schema.triggers order by trigger_name; +select trigger_name from information_schema.triggers where trigger_schema <> 'sys' order by trigger_name; trigger_name gs_insert trg5_1 diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc index e49bcead9f1..19d87739b96 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc @@ -235,7 +235,7 @@ let $message= Testcase 3.5.1.7: - need to fix; select * from t1; update t1 set f2='update 3.5.1.7'; select * from t1; - select trigger_name from information_schema.triggers order by trigger_name; + select trigger_name from information_schema.triggers where trigger_schema <> 'sys' order by trigger_name; #Cleanup --disable_warnings diff --git a/mysql-test/suite/galera/r/MW-416.result b/mysql-test/suite/galera/r/MW-416.result index 68406c4dcf4..ae95b832802 100644 --- a/mysql-test/suite/galera/r/MW-416.result +++ b/mysql-test/suite/galera/r/MW-416.result @@ -110,4 +110,5 @@ information_schema mtr mysql performance_schema +sys test diff --git a/mysql-test/suite/innodb_zip/r/innodb-zip.result b/mysql-test/suite/innodb_zip/r/innodb-zip.result index e0a454b75a4..0a3119f48a4 100644 --- a/mysql-test/suite/innodb_zip/r/innodb-zip.result +++ b/mysql-test/suite/innodb_zip/r/innodb-zip.result @@ -62,7 +62,7 @@ row_format=compressed; create table t14(a int primary key) engine=innodb key_block_size=9; Warnings: Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=9. -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t0 Dynamic {valid} 0 mysqltest_innodb_zip t00 Dynamic {valid} 0 @@ -83,15 +83,15 @@ mysqltest_innodb_zip t9 Compact {valid} 0 drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14; alter table t1 key_block_size=0; alter table t1 row_format=dynamic; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Dynamic {valid} 0 alter table t1 row_format=compact; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Compact {valid} 0 alter table t1 row_format=redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Redundant {valid} 0 drop table t1; @@ -129,7 +129,7 @@ Table Op Msg_type Msg_text mysqltest_innodb_zip.t2 analyze status Engine-independent statistics collected mysqltest_innodb_zip.t2 analyze Warning Engine-independent statistics are not collected for column 'b' mysqltest_innodb_zip.t2 analyze status OK -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Compressed 2048 1024 mysqltest_innodb_zip t2 Dynamic {valid} 0 @@ -173,7 +173,7 @@ create table t8 (id int primary key) engine = innodb row_format = compressed; create table t9 (id int primary key) engine = innodb row_format = dynamic; create table t10(id int primary key) engine = innodb row_format = compact; create table t11(id int primary key) engine = innodb row_format = redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Dynamic {valid} 0 mysqltest_innodb_zip t10 Compact {valid} 0 @@ -212,7 +212,7 @@ Error 1005 Can't create table `mysqltest_innodb_zip`.`t4` (errno: 140 "Wrong cre Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB create table t5 (id int primary key) engine = innodb key_block_size = 4 row_format = default; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t1 Compressed 4096 0 mysqltest_innodb_zip t5 Compressed 4096 0 @@ -244,7 +244,7 @@ Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 1 Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE. Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length set global innodb_file_per_table = off; create table t1 (id int primary key) engine = innodb key_block_size = 1; @@ -280,7 +280,7 @@ show warnings; Level Code Message create table t8 (id int primary key) engine = innodb row_format = compact; create table t9 (id int primary key) engine = innodb row_format = redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name; +SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name; table_schema table_name row_format data_length index_length mysqltest_innodb_zip t7 Dynamic {valid} 0 mysqltest_innodb_zip t8 Compact {valid} 0 diff --git a/mysql-test/suite/innodb_zip/t/innodb-zip.test b/mysql-test/suite/innodb_zip/t/innodb-zip.test index 9049b231191..507900aa88c 100644 --- a/mysql-test/suite/innodb_zip/t/innodb-zip.test +++ b/mysql-test/suite/innodb_zip/t/innodb-zip.test @@ -9,7 +9,7 @@ SELECT table_name, row_format, data_length, index_length let $per_table=`select @@innodb_file_per_table`; SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; ---let $query_i_s = SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' order by table_name +--let $query_i_s = SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' and table_schema != 'sys' order by table_name set session innodb_strict_mode=0; set global innodb_file_per_table=off; diff --git a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result index 78c80c27cc5..d1262a63082 100644 --- a/mysql-test/suite/jp/r/jp_create_db_sjis.result +++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result @@ -11,6 +11,7 @@ schema_name information_schema mysql performance_schema +sys test \\\ { diff --git a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result index 380fcf09389..c8ddd0075a0 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result +++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result @@ -12,6 +12,7 @@ schema_name information_schema mysql performance_schema +sys test ܸ ݏ diff --git a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result index 529a225e4ed..af2e809d1fa 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ujis.result +++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result @@ -11,6 +11,7 @@ schema_name information_schema mysql performance_schema +sys test ܸ ݏ diff --git a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result index 7d950ea53f9..a77c4c5e095 100644 --- a/mysql-test/suite/jp/r/jp_create_db_utf8.result +++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result @@ -11,6 +11,7 @@ schema_name information_schema mysql performance_schema +sys test 日本語 龔龖龗 diff --git a/mysql-test/suite/perfschema/r/max_program_zero.result b/mysql-test/suite/perfschema/r/max_program_zero.result index b75b24ffdb4..34d27885ad9 100644 --- a/mysql-test/suite/perfschema/r/max_program_zero.result +++ b/mysql-test/suite/perfschema/r/max_program_zero.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result index 00baba09fb6..bfc49fd3480 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result index 6fe051b3c42..e9f20398467 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result index b582ca072c8..ffb45f4f55f 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result index 1431f925ae2..e271d5a10e6 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result index 1b9356b34a2..833da22583e 100644 --- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result +++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result index c64e4f8416d..e3ff0f514a7 100644 --- a/mysql-test/suite/perfschema/r/start_server_innodb.result +++ b/mysql-test/suite/perfschema/r/start_server_innodb.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_low_index.result b/mysql-test/suite/perfschema/r/start_server_low_index.result index 9fd9a8a447c..ffdf9d65b87 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_index.result +++ b/mysql-test/suite/perfschema/r/start_server_low_index.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result index 981fa297971..dbb404f6129 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result index 4333c6f74d2..f92b0e6bec6 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_account.result +++ b/mysql-test/suite/perfschema/r/start_server_no_account.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result index 74c4bed9696..fefad55c209 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result index 03a7f935317..0c2f65f6ac9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result index c962a74e0db..c3f06b53425 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result index ef80d6e3a2d..fd39807d567 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result index b58acf57362..43111c5ec40 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_host.result +++ b/mysql-test/suite/perfschema/r/start_server_no_host.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_index.result b/mysql-test/suite/perfschema/r/start_server_no_index.result index 9e7a2bf34a7..15d1184bcbe 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_index.result +++ b/mysql-test/suite/perfschema/r/start_server_no_index.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_mdl.result b/mysql-test/suite/perfschema/r/start_server_no_mdl.result index 886a1ee1633..b8de90453ce 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mdl.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result index a6605cc5ffb..60066264c90 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_memory_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result index ae30ac59bdb..3353b46bbcb 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result index 1f4086500a0..d41da361733 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result index 32356175e82..4919de6bb6c 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result +++ b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result index 75ebff83745..02a119bdc68 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result index d7ebfb33d5b..ead01ce2d0e 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result index b4b79d02b32..a99f1c0f9be 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result index aef0eb7c14d..7c148889412 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result +++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result index 4695c03dc34..dec0680c511 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result index 45f668bd668..20adf1a9f64 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result index cccc88ea078..044f9475041 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result index 3631b3e401f..350f2c6637d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result index bb17a80d853..d2d7063c32f 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result index 61cf11f2238..ca7c49cd51a 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result index 94811c40c53..8bcb3c56a00 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result index 4d61bf58fca..2a2bf5d3f7c 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result index 49b59cbc48c..ec6e40acc00 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result index 17a10cf715e..b3f1e4cbcf2 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result index a93f900f650..baf9f761358 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result index 051c81dd12f..cd204f3d811 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result index abedd06c0d9..d083484cd7c 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result +++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result index 1d5597f554b..f5a12e5473d 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result index 99e170c9bb1..76ae9d5fa4e 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result index 46aaa06bf65..4bd472a22a9 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_user.result +++ b/mysql-test/suite/perfschema/r/start_server_no_user.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result index 1b717b9f768..f59b156ce1e 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result index 5691b0e7826..cc70572c7ef 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result +++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result index 5dcda26313a..985282c0168 100644 --- a/mysql-test/suite/perfschema/r/start_server_nothing.result +++ b/mysql-test/suite/perfschema/r/start_server_nothing.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result index 06af389a857..a53d591938c 100644 --- a/mysql-test/suite/perfschema/r/start_server_off.result +++ b/mysql-test/suite/perfschema/r/start_server_off.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result index c64e4f8416d..e3ff0f514a7 100644 --- a/mysql-test/suite/perfschema/r/start_server_on.result +++ b/mysql-test/suite/perfschema/r/start_server_on.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/start_server_variables.result b/mysql-test/suite/perfschema/r/start_server_variables.result index 6ed93360d9b..7d1d1e05375 100644 --- a/mysql-test/suite/perfschema/r/start_server_variables.result +++ b/mysql-test/suite/perfschema/r/start_server_variables.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result index ebacc9a8f7e..186d2c36316 100644 --- a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result +++ b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result @@ -4,6 +4,7 @@ information_schema mtr mysql performance_schema +sys test select count(*) from performance_schema.performance_timers; count(*) diff --git a/mysql-test/suite/roles/set_role-9614.result b/mysql-test/suite/roles/set_role-9614.result index 7085d2287e2..318d9ced73e 100644 --- a/mysql-test/suite/roles/set_role-9614.result +++ b/mysql-test/suite/roles/set_role-9614.result @@ -52,6 +52,7 @@ information_schema mtr mysql performance_schema +sys test # # Try using the database as john. diff --git a/mysql-test/suite/rpl/r/rpl_ctype_latin1.result b/mysql-test/suite/rpl/r/rpl_ctype_latin1.result index 5399581ac26..333e701de0e 100644 --- a/mysql-test/suite/rpl/r/rpl_ctype_latin1.result +++ b/mysql-test/suite/rpl/r/rpl_ctype_latin1.result @@ -23,7 +23,7 @@ hex(table_name) select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "v%"; hex(table_name) 76C391E28098 -SHOW PROCEDURE STATUS LIKE 'p%'; +SHOW PROCEDURE STATUS WHERE Name LIKE 'p%' and Db = 'test'; Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation test pё PROCEDURE root@localhost ts ts DEFINER latin1 latin1_swedish_ci latin1_swedish_ci connection master; diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_loaddata_m.result index 8e2bc2f0b1c..fdb5ca31e94 100644 --- a/mysql-test/suite/rpl/r/rpl_loaddata_m.result +++ b/mysql-test/suite/rpl/r/rpl_loaddata_m.result @@ -23,6 +23,7 @@ mtr mysql mysqltest performance_schema +sys test USE test; SHOW TABLES; diff --git a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result index 2778ac1bf61..2ef096b6207 100644 --- a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result +++ b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result @@ -8,6 +8,7 @@ information_schema mtr mysql performance_schema +sys test test_ignore USE test; @@ -43,6 +44,7 @@ information_schema mtr mysql performance_schema +sys test USE test; SHOW TABLES; diff --git a/mysql-test/suite/rpl/t/rpl_ctype_latin1.test b/mysql-test/suite/rpl/t/rpl_ctype_latin1.test index a85254214d2..4c3535a18a1 100644 --- a/mysql-test/suite/rpl/t/rpl_ctype_latin1.test +++ b/mysql-test/suite/rpl/t/rpl_ctype_latin1.test @@ -33,7 +33,7 @@ select hex(table_name) from information_schema.tables where table_schema="test" select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "t%"; select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "v%"; --replace_column 5 ts 6 ts -SHOW PROCEDURE STATUS LIKE 'p%'; +SHOW PROCEDURE STATUS WHERE Name LIKE 'p%' and Db = 'test'; --connection master DROP TABLE `tё`; diff --git a/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result b/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result index 6ae3fd70188..1c25fedf03d 100644 --- a/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result +++ b/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result @@ -12,6 +12,7 @@ information_schema mtr mysql performance_schema +sys test USE ignored_db; ERROR 42000: Incorrect database name 'ignored_db' @@ -40,6 +41,7 @@ lost+found mtr mysql performance_schema +sys test DROP DATABASE `lost+found`; SET @@global.ignore_db_dirs = 'aha'; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 44b899ef23b..6ae12490228 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -40,19 +40,22 @@ IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) MARK_AS_ADVANCED(CAT_EXECUTABLE) ENDIF() +IF(NOT ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")) + FOREACH(f fill_help_tables.sql mysql_system_tables_fix.sql mysql_system_tables.sql mysql_system_tables_data.sql mysql_performance_tables.sql) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${f} ${CMAKE_CURRENT_BINARY_DIR}/${f} COPYONLY) + ENDFOREACH() +ENDIF() + IF(CAT_EXECUTABLE) SET(CAT_COMMAND COMMAND - ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} - ${CAT_EXECUTABLE} mysql_system_tables_fix.sql mysql_system_tables.sql mysql_performance_tables.sql > - ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql + ${CAT_EXECUTABLE} mysql_system_tables_fix.sql mysql_system_tables.sql mysql_performance_tables.sql mysql_sys_schema.sql> + mysql_fix_privilege_tables.sql ) ELSEIF(WIN32) - FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql - native_outfile ) SET(CAT_COMMAND - COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} - cmd /c copy /b mysql_system_tables_fix.sql + mysql_system_tables.sql + mysql_performance_tables.sql - ${native_outfile} ) + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR} + cmd /c copy /b mysql_system_tables_fix.sql + mysql_system_tables.sql + mysql_performance_tables.sql + mysql_sys_schema.sql + mysql_fix_privilege_tables.sql ) ELSE() MESSAGE(FATAL_ERROR "Cannot concatenate files") ENDIF() @@ -70,6 +73,7 @@ ADD_CUSTOM_COMMAND( ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_fix.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_performance_tables.sql + ${CMAKE_CURRENT_BINARY_DIR}/mysql_sys_schema.sql ) # Add target for the above to be built @@ -114,6 +118,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_to_mariadb.sql ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql + ${CMAKE_CURRENT_BINARY_DIR}/mysql_sys_schema.sql ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -394,3 +399,5 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") COMPONENT Development) ENDIF() ENDIF() + +ADD_SUBDIRECTORY(sys_schema)
\ No newline at end of file diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 5f183afe8fc..6a2c64d6965 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -388,8 +388,9 @@ create_system_tables2="$srcpkgdatadir/mysql_performance_tables.sql" fill_system_tables="$srcpkgdatadir/mysql_system_tables_data.sql" maria_add_gis_sp="$buildpkgdatadir/maria_add_gis_sp_bootstrap.sql" mysql_test_db="$srcpkgdatadir/mysql_test_db.sql" +mysql_sys_schema="$srcpkgdatadir/mysql_sys_schema.sql" -for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp" "$mysql_test_db" +for f in "$fill_help_tables" "$create_system_tables" "$create_system_tables2" "$fill_system_tables" "$maria_add_gis_sp" "$mysql_test_db" "$mysql_sys_schema" do if test ! -f "$f" then diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt new file mode 100644 index 00000000000..f2f206a1a93 --- /dev/null +++ b/scripts/sys_schema/CMakeLists.txt @@ -0,0 +1,176 @@ +IF(TARGET perfschema) +SET(files +${CMAKE_CURRENT_SOURCE_DIR}/before_setup.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/version.sql +${CMAKE_CURRENT_SOURCE_DIR}/tables/sys_config.sql +${CMAKE_CURRENT_SOURCE_DIR}/tables/sys_config_data_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/triggers/sys_config_insert_set_user.sql +${CMAKE_CURRENT_SOURCE_DIR}/triggers/sys_config_update_set_user.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/extract_schema_from_file_name.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/extract_table_from_file_name.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/format_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/format_path_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/format_statement.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/format_time.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/list_add.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/list_drop.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_is_account_enabled.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_is_consumer_enabled.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_is_instrument_default_enabled.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_is_instrument_default_timed.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_is_thread_instrumented.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_thread_id.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_thread_account.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_thread_stack.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/ps_thread_trx_info.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/quote_identifier.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/sys_get_config.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/version_major.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/version_minor.sql +${CMAKE_CURRENT_SOURCE_DIR}/functions/version_patch.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/innodb_buffer_stats_by_schema.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/x_innodb_buffer_stats_by_schema.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/innodb_buffer_stats_by_table.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/x_innodb_buffer_stats_by_table.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/innodb_lock_waits.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/x_innodb_lock_waits.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/schema_object_overview.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/schema_auto_increment_columns.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/x_schema_flattened_keys.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/i_s/schema_redundant_indexes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/ps_check_lost_instrumentation_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/latest_file_io.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_latest_file_io.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/io_by_thread_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_io_by_thread_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/io_global_by_file_by_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_io_global_by_file_by_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/io_global_by_file_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_io_global_by_file_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/io_global_by_wait_by_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_io_global_by_wait_by_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/io_global_by_wait_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_io_global_by_wait_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/memory_by_user_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_memory_by_user_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/memory_by_host_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_memory_by_host_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/memory_by_thread_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_memory_by_thread_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/memory_global_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_memory_global_by_current_bytes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/memory_global_total.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_memory_global_total.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/schema_index_statistics.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_schema_index_statistics.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_ps_schema_table_statistics_io.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/schema_table_statistics.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_schema_table_statistics.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/schema_table_statistics_with_buffer.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_schema_table_statistics_with_buffer.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/schema_tables_with_full_table_scans.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_schema_tables_with_full_table_scans.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/schema_unused_indexes.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/schema_table_lock_waits.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_schema_table_lock_waits.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/statement_analysis.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_statement_analysis.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/statements_with_errors_or_warnings.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_statements_with_errors_or_warnings.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/statements_with_full_table_scans.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_statements_with_full_table_scans.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_ps_digest_avg_latency_distribution.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_ps_digest_95th_percentile_by_avg_us.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/statements_with_runtimes_in_95th_percentile.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_statements_with_runtimes_in_95th_percentile.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/statements_with_sorting.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_statements_with_sorting.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/statements_with_temp_tables.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_statements_with_temp_tables.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/user_summary_by_file_io_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_user_summary_by_file_io_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/user_summary_by_file_io.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_user_summary_by_file_io.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/user_summary_by_statement_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_user_summary_by_statement_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/user_summary_by_statement_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_user_summary_by_statement_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/user_summary_by_stages.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_user_summary_by_stages.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/user_summary_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_user_summary_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/host_summary_by_file_io_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_host_summary_by_file_io_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/host_summary_by_file_io.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_host_summary_by_file_io.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/host_summary_by_statement_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_host_summary_by_statement_type.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/host_summary_by_statement_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_host_summary_by_statement_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/host_summary_by_stages.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_host_summary_by_stages.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/host_summary_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_host_summary_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/wait_classes_global_by_avg_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_wait_classes_global_by_avg_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/wait_classes_global_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_wait_classes_global_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/waits_by_user_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_waits_by_user_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/waits_by_host_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_waits_by_host_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/waits_global_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_waits_global_by_latency.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/metrics.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/processlist_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_processlist_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/sessions.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/x_sessions.sql +${CMAKE_CURRENT_SOURCE_DIR}/views/p_s/session_ssl_status.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/create_synonym_db.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/execute_prepared_stmt.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/diagnostics.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_statement_avg_latency_histogram.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_trace_statement_digest.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_trace_thread.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_disable_background_threads.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_disable_consumer.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_disable_instrument.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_disable_thread.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_enable_background_threads.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_enable_consumer.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_enable_instrument.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_enable_thread.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_reload_saved.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_reset_to_default_57_before.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_reset_to_default_57.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_reset_to_default_57_after.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_save.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_show_disabled.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_show_disabled_consumers.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_show_disabled_instruments.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_show_enabled.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_show_enabled_consumers.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_setup_show_enabled_instruments.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/ps_truncate_all_tables.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/statement_performance_analyzer.sql +${CMAKE_CURRENT_SOURCE_DIR}/procedures/table_exists.sql +${CMAKE_CURRENT_SOURCE_DIR}/after_setup.sql +) +ELSE() +SET(files + ${CMAKE_CURRENT_SOURCE_DIR}/before_setup.sql + ${CMAKE_CURRENT_SOURCE_DIR}/tables/sys_config.sql + ${CMAKE_CURRENT_SOURCE_DIR}/tables/sys_config_data_57.sql + ${CMAKE_CURRENT_SOURCE_DIR}/triggers/sys_config_insert_set_user.sql + ${CMAKE_CURRENT_SOURCE_DIR}/triggers/sys_config_update_set_user.sql + ${CMAKE_CURRENT_SOURCE_DIR}/after_setup.sql) +ENDIF() + +SET(CMAKE_CONFIGURABLE_FILE_CONTENT) + +FOREACH(f ${files}) + FILE(READ ${f} content) + SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${CMAKE_CONFIGURABLE_FILE_CONTENT}${content}\n") +ENDFOREACH() +CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/configurable_file_content.in ${CMAKE_BINARY_DIR}/scripts/mysql_sys_schema.sql) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 39307ab8183..9f44eee1f96 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -416,7 +416,7 @@ IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING) COMMAND ${CMAKE_COMMAND} -E make_directory data COMMAND ${CMAKE_COMMAND} -E chdir data ${CMAKE_COMMAND} ${CONFIG_PARAM} - -DTOP_SRCDIR="${CMAKE_SOURCE_DIR}" + -DTOP_SRCDIR="${CMAKE_BINARY_DIR}" -DBINDIR="${CMAKE_CURRENT_BINARY_DIR}" -DMYSQLD_EXECUTABLE="$<TARGET_FILE:mariadbd>" -DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}" @@ -443,14 +443,15 @@ IF(WIN32) # Create bootstrapper SQL script ADD_CUSTOM_COMMAND(OUTPUT ${my_bootstrap_sql} - COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_SOURCE_DIR}/scripts - cmd /c copy mysql_system_tables.sql+mysql_system_tables_data.sql+fill_help_tables.sql+mysql_performance_tables.sql+mysql_test_db.sql ${native_outfile} + COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/scripts + cmd /c copy mysql_system_tables.sql+mysql_system_tables_data.sql+fill_help_tables.sql+mysql_performance_tables.sql+mysql_test_db.sql+mysql_sys_schema.sql ${native_outfile} DEPENDS ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables.sql ${CMAKE_SOURCE_DIR}/scripts/mysql_system_tables_data.sql ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql ${CMAKE_SOURCE_DIR}/scripts/mysql_performance_tables.sql ${CMAKE_SOURCE_DIR}/scripts/mysql_test_db.sql + ${CMAKE_BINARY_DIR}/scripts/mysql_sys_schema.sql ) ADD_CUSTOM_COMMAND( diff --git a/storage/rocksdb/mysql-test/rocksdb/r/misc.result b/storage/rocksdb/mysql-test/rocksdb/r/misc.result index b2e5d04f6f8..f8734da6e6b 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/misc.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/misc.result @@ -79,6 +79,7 @@ roles_mapping Host NULL NULL roles_mapping Role NULL NULL roles_mapping User NULL NULL servers Server_name NULL NULL +sys_config variable NULL NULL table_stats db_name NULL NULL table_stats table_name NULL NULL tables_priv Db NULL NULL |