database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-9077 Use sys schema in bootstrapping, incl. mtr

Browse Source
This commit is contained in:
Vladislav Vaintroub
2021-03-03 10:30:29 +01:00
parent 9186ff88da
commit aa2ff62082
142 changed files with 4149 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/create_initial_db.cmake
View File

@ -34,9 +34,11 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql mysql_perf
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
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) MAKE_DIRECTORY(mysql)

1
debian/mariadb-server-core-10.6.install vendored
View File

@ -30,6 +30,7 @@ usr/share/mysql/japanese
usr/share/mysql/korean usr/share/mysql/korean
usr/share/mysql/maria_add_gis_sp_bootstrap.sql usr/share/mysql/maria_add_gis_sp_bootstrap.sql
usr/share/mysql/mysql_performance_tables.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.sql
usr/share/mysql/mysql_system_tables_data.sql usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_test_data_timezone.sql usr/share/mysql/mysql_test_data_timezone.sql

6
mysql-test/include/mtr_check.sql
View File

@ -71,9 +71,9 @@ BEGIN
SELECT * FROM INFORMATION_SCHEMA.EVENTS; SELECT * FROM INFORMATION_SCHEMA.EVENTS;
-- Dump all triggers except mtr internals, there should be none -- Dump all triggers except mtr internals, there should be none
SELECT * FROM INFORMATION_SCHEMA.TRIGGERS 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 -- 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'; SHOW STATUS LIKE 'slave_open_temp_tables';
@ -87,7 +87,7 @@ BEGIN
mysql.help_keyword, mysql.help_keyword,
mysql.help_relation, mysql.help_relation,
mysql.plugin, mysql.plugin,
mysql.proc, -- mysql.proc,
mysql.procs_priv, mysql.procs_priv,
mysql.roles_mapping, mysql.roles_mapping,
mysql.tables_priv, mysql.tables_priv,

3
mysql-test/include/mysql_upgrade_preparation.inc
View File

@ -2,6 +2,9 @@
# Can't run test of external client with embedded server # Can't run test of external client with embedded server
-- source include/not_embedded.inc -- 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: # Hack:
# #

1
mysql-test/main/1st.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
show tables in mysql; show tables in mysql;
Tables_in_mysql Tables_in_mysql

1
mysql-test/main/create_drop_role.result
View File

@ -65,6 +65,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
SET ROLE NONE; SET ROLE NONE;
connect user_b, localhost, root,,; connect user_b, localhost, root,,;

204
mysql-test/main/ctype_upgrade.result
View File

@ -261,6 +261,106 @@ mysql.transaction_registry OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -270,6 +370,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.maria050313_ucs2_croatian_ci_def Needs upgrade test.maria050313_ucs2_croatian_ci_def Needs upgrade
test.maria050313_utf8_croatian_ci 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 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -329,6 +531,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.maria050313_ucs2_croatian_ci_def OK test.maria050313_ucs2_croatian_ci_def OK
test.maria050313_utf8_croatian_ci OK test.maria050313_utf8_croatian_ci OK

2
mysql-test/main/drop.result
View File

@ -52,6 +52,7 @@ mtr
mysql mysql
mysqltest mysqltest
performance_schema performance_schema
sys
test test
flush tables with read lock; flush tables with read lock;
drop database mysqltest; drop database mysqltest;
@ -64,6 +65,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
drop database mysqltest; drop database mysqltest;
ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist

148
mysql-test/main/information_schema.result
View File

@ -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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
select schema_name from information_schema.schemata; select schema_name from information_schema.schemata;
schema_name schema_name
@ -21,6 +22,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
show databases like 't%'; show databases like 't%';
Database (t%) Database (t%)
@ -31,6 +33,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
show databases where `database` = 't%'; show databases where `database` = 't%';
Database Database
@ -368,12 +371,12 @@ test sub1
drop view v1; drop view v1;
connect user1,localhost,mysqltest_1,,; connect user1,localhost,mysqltest_1,,;
connection user1; 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 ROUTINE_NAME ROUTINE_DEFINITION
show create function sub1; show create function sub1;
ERROR 42000: FUNCTION sub1 does not exist ERROR 42000: FUNCTION sub1 does not exist
connection user3; 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 ROUTINE_NAME ROUTINE_DEFINITION
sel2 NULL sel2 NULL
sub1 NULL sub1 NULL
@ -381,13 +384,13 @@ connection default;
grant all privileges on test.* to mysqltest_1@localhost; grant all privileges on test.* to mysqltest_1@localhost;
connect user2,localhost,mysqltest_1,,; connect user2,localhost,mysqltest_1,,;
connection user2; 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 ROUTINE_NAME ROUTINE_DEFINITION
sel2 NULL sel2 NULL
sub1 NULL sub1 NULL
create function sub2(i int) returns int create function sub2(i int) returns int
return i+1; 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 ROUTINE_NAME ROUTINE_DEFINITION
sel2 NULL sel2 NULL
sub1 NULL sub1 NULL
@ -423,6 +426,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
explain select * from v0; explain select * from v0;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
@ -458,7 +462,7 @@ latin1_swedish_nopad_ci
latin1_nopad_bin latin1_nopad_bin
show keys from v4; 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 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 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 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 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 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 v2 (c) as select a from t1 WITH LOCAL CHECK OPTION;
create view v3 (c) as select a from t1 WITH CASCADED 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 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 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 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 TRIGGERS ACTION_STATEMENT
information_schema VIEWS VIEW_DEFINITION information_schema VIEWS VIEW_DEFINITION
mysql global_priv Priv 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 Password
mysql user ssl_cipher mysql user ssl_cipher
mysql user x509_issuer mysql user x509_issuer
@ -891,6 +909,17 @@ mysql user x509_subject
mysql user plugin mysql user plugin
mysql user authentication_string mysql user authentication_string
mysql user default_role 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 select table_name, column_name, data_type from information_schema.columns
where data_type = 'datetime' and table_name not like 'innodb_%' where data_type = 'datetime' and table_name not like 'innodb_%'
order by binary table_name, ordinal_position; order by binary table_name, ordinal_position;
@ -920,6 +949,9 @@ event execute_at datetime
event last_executed datetime event last_executed datetime
event starts datetime event starts datetime
event ends 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 SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES A
WHERE NOT EXISTS WHERE NOT EXISTS
(SELECT * FROM INFORMATION_SCHEMA.COLUMNS B (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 p1 () modifies sql data set @a = 5;
create procedure p2 () set @a = 5; create procedure p2 () set @a = 5;
select sql_data_access from information_schema.routines 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 sql_data_access
MODIFIES SQL DATA MODIFIES SQL DATA
CONTAINS SQL 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 func2() RETURNS BIGINT RETURN 1;
CREATE FUNCTION func1() RETURNS BIGINT CREATE FUNCTION func1() RETURNS BIGINT
BEGIN BEGIN
RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS); RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA <> 'sys');
END// END//
CREATE VIEW v1 AS SELECT 1 FROM t1 CREATE VIEW v1 AS SELECT 1 FROM t1
WHERE f3 = (SELECT func2 ()); 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; 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; select table_name, is_updatable from information_schema.views order by table_name;
table_name is_updatable 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 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 v1 NO
v2 YES 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; delete from v1;
drop view v1,v2; drop view v1,v2;
drop table t1,t2; drop table t1,t2;

16
mysql-test/main/information_schema.test
View File

@ -187,19 +187,19 @@ drop view v1;
connect (user1,localhost,mysqltest_1,,); connect (user1,localhost,mysqltest_1,,);
connection user1; 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 --error ER_SP_DOES_NOT_EXIST
show create function sub1; show create function sub1;
connection user3; 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; connection default;
grant all privileges on test.* to mysqltest_1@localhost; grant all privileges on test.* to mysqltest_1@localhost;
connect (user2,localhost,mysqltest_1,,); connect (user2,localhost,mysqltest_1,,);
connection user2; 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 create function sub2(i int) returns int
return i+1; 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 procedure sel2;
show create function sub1; show create function sub1;
show create function sub2; show create function sub2;
@ -233,7 +233,7 @@ where COLLATION_NAME like "latin1%";
select * from v4; select * from v4;
show keys from v4; show keys from v4;
--sorted_result --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; 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 v2 (c) as select a from t1 WITH LOCAL CHECK OPTION;
create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION; create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION;
--sorted_result --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; grant select (a) on test.t1 to joe@localhost with grant option;
select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES; select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES;
select * from INFORMATION_SCHEMA.TABLE_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 p1 () modifies sql data set @a = 5;
create procedure p2 () set @a = 5; create procedure p2 () set @a = 5;
select sql_data_access from information_schema.routines 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 p1;
drop procedure p2; drop procedure p2;
@ -835,7 +835,7 @@ CREATE FUNCTION func2() RETURNS BIGINT RETURN 1;
delimiter //; delimiter //;
CREATE FUNCTION func1() RETURNS BIGINT CREATE FUNCTION func1() RETURNS BIGINT
BEGIN BEGIN
RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS); RETURN ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA <> 'sys');
END// END//
delimiter ;// delimiter ;//

2
mysql-test/main/init_file_longline_3816.result
View File

@ -1,3 +1,3 @@
select count(*) from t4; select count(*) from t4;
count(*) count(*)
0 193

102
mysql-test/main/log_tables_upgrade.result
View File

@ -46,6 +46,106 @@ mysql.transaction_registry OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -55,6 +155,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

102
mysql-test/main/lowercase_fs_off.result
View File

@ -137,6 +137,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -147,6 +247,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

2
mysql-test/main/mysql_install_db_win.result
View File

@ -6,7 +6,7 @@ Setting root password
Creation of the database was successful Creation of the database was successful
# Kill the server # Kill the server
# restart: --datadir=MYSQLTEST_VARDIR/tmp/ddir --loose-innodb # restart: --datadir=MYSQLTEST_VARDIR/tmp/ddir --loose-innodb
connect root,localhost,root,foo; connect root,localhost,root,foo,mysql;
SELECT @@datadir; SELECT @@datadir;
@@datadir @@datadir
DATADIR/ DATADIR/

2
mysql-test/main/mysql_install_db_win.test
View File

@ -9,7 +9,7 @@ exec $MYSQL_INSTALL_DB_EXE --datadir=$ddir --password=foo -R;
let $restart_parameters=--datadir=$ddir --loose-innodb; let $restart_parameters=--datadir=$ddir --loose-innodb;
--source include/start_mysqld.inc --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 # Smoke test - check that we're actually using datadir
# we've created (i.e restart_parameters worked) # we've created (i.e restart_parameters worked)
--replace_result $ddir DATADIR --replace_result $ddir DATADIR

102
mysql-test/main/mysql_json_mysql_upgrade.result
View File

@ -57,6 +57,106 @@ Phase 2/7: Installing used storage engines... Skipped
installing plugin for MYSQL_JSON data type installing plugin for MYSQL_JSON data type
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -66,6 +166,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.mysql_json_test Needs upgrade test.mysql_json_test Needs upgrade
test.mysql_json_test_big Needs upgrade test.mysql_json_test_big Needs upgrade

102
mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result
View File

@ -57,6 +57,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -66,6 +166,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.mysql_json_test Needs upgrade test.mysql_json_test Needs upgrade
test.mysql_json_test_big Needs upgrade test.mysql_json_test_big Needs upgrade

102
mysql-test/main/mysql_upgrade-20228.result
View File

@ -50,6 +50,106 @@ mysql.transaction_registry OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -59,6 +159,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

102
mysql-test/main/mysql_upgrade-6984.result
View File

@ -50,6 +50,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -59,6 +159,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

1123
mysql-test/main/mysql_upgrade.result
View File

File diff suppressed because it is too large Load Diff

3
mysql-test/main/mysql_upgrade.test
View File

@ -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 # 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"); 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 --let $old_version= 5.5
--source include/load_dump_and_upgrade.inc --source include/load_dump_and_upgrade.inc

102
mysql-test/main/mysql_upgrade_mysql_json_datatype.result
View File

@ -44,6 +44,106 @@ mysql.transaction_registry OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -53,6 +153,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.mysql_json_test Needs upgrade test.mysql_json_test Needs upgrade
test.mysql_json_test_big Needs upgrade test.mysql_json_test_big Needs upgrade

306
mysql-test/main/mysql_upgrade_noengine.result
View File

@ -89,6 +89,106 @@ mysql.transaction_registry OK
mysql.user OK mysql.user OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -98,6 +198,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.t1 test.t1
Error : Unknown storage engine 'BLACKHOLE' Error : Unknown storage engine 'BLACKHOLE'
@ -182,6 +284,106 @@ mysql.transaction_registry OK
mysql.user OK mysql.user OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -191,6 +393,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.t1 test.t1
Error : Unknown storage engine 'BLACKHOLE' 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 'archive' storage engine
installing plugin for 'blackhole' storage engine installing plugin for 'blackhole' storage engine
Phase 3/7: Fixing views 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -288,6 +592,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.t1 OK test.t1 OK
test.t2 OK test.t2 OK

102
mysql-test/main/mysql_upgrade_ssl.result
View File

@ -35,6 +35,106 @@ mysql.transaction_registry OK
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -44,6 +144,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

304
mysql-test/main/mysql_upgrade_view.result
View File

@ -114,6 +114,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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.v1 OK
test.v1badcheck OK test.v1badcheck OK
test.v2 OK test.v2 OK
@ -127,6 +227,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.kv OK test.kv OK
test.t1 OK test.t1 OK
@ -264,6 +366,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views from mysql Phase 3/7: Fixing views from mysql
mysql.user OK 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.v1 OK
test.v2 OK test.v2 OK
test.v3 OK test.v3 OK
@ -277,6 +479,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
test.kv OK test.kv OK
test.t1 OK test.t1 OK
@ -389,6 +593,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views from mysql Phase 3/7: Fixing views from mysql
mysql.user OK 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.v1 OK
test.v2 OK test.v2 OK
test.v3 OK test.v3 OK

3
mysql-test/main/mysqlcheck.result
View File

@ -34,6 +34,7 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.transaction_registry OK mysql.transaction_registry OK
sys.sys_config OK
mtr.global_suppressions Table is already up to date mtr.global_suppressions Table is already up to date
mtr.test_suppressions Table is already up to date mtr.test_suppressions Table is already up to date
mysql.column_stats OK mysql.column_stats OK
@ -70,6 +71,7 @@ mysql.time_zone_transition_type OK
mysql.transaction_registry mysql.transaction_registry
note : Table does not support optimize, doing recreate + analyze instead note : Table does not support optimize, doing recreate + analyze instead
status : OK status : OK
sys.sys_config OK
mysql.column_stats OK mysql.column_stats OK
mysql.columns_priv OK mysql.columns_priv OK
mysql.db OK mysql.db OK
@ -465,6 +467,7 @@ warning : Table is marked as crashed
warning : Size of datafile is: 4 Should be: 0 warning : Size of datafile is: 4 Should be: 0
error : got error: 0 when reading datafile at record: 0 error : got error: 0 when reading datafile at record: 0
error : Corrupt error : Corrupt
sys.sys_config Table is already up to date
test.t2 Table is already up to date test.t2 Table is already up to date
Repairing tables Repairing tables

2
mysql-test/main/mysqlslap.result
View File

@ -230,6 +230,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
# 'bug58090' database should be present. # 'bug58090' database should be present.
SHOW DATABASES; SHOW DATABASES;
@ -239,6 +240,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
DROP DATABASE bug58090; DROP DATABASE bug58090;
# #

1
mysql-test/main/ps_1general.result
View File

@ -264,6 +264,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
prepare stmt4 from ' show tables from test like ''t2%'' '; prepare stmt4 from ' show tables from test like ''t2%'' ';
execute stmt4; execute stmt4;

2
mysql-test/main/ps_ddl.result
View File

@ -769,7 +769,7 @@ deallocate prepare stmt;
# #
# Test 3: View referencing an Information schema table # 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"; prepare stmt from "select * from t1";
execute stmt; execute stmt;
table_name table_name

2
mysql-test/main/ps_ddl.test
View File

@ -699,7 +699,7 @@ deallocate prepare stmt;
--echo # --echo #
--echo # Test 3: View referencing an Information schema table --echo # Test 3: View referencing an Information schema table
--echo # --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"; prepare stmt from "select * from t1";
execute stmt; execute stmt;

1
mysql-test/main/schema.result
View File

@ -10,6 +10,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
drop schema foo; drop schema foo;
# #

1
mysql-test/main/show_check.result
View File

@ -149,6 +149,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
show databases like "test%"; show databases like "test%";
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr

4
mysql-test/main/show_function_with_pad_char_to_full_length.result
View File

@ -1,9 +1,9 @@
create function f() returns int return 1; 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 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 T f T T T T T T T T T
set sql_mode = 'PAD_CHAR_TO_FULL_LENGTH'; 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 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 T f T T T T T T T T T
drop function f; drop function f;

4
mysql-test/main/show_function_with_pad_char_to_full_length.test
View File

@ -6,10 +6,10 @@
create function f() returns int return 1; 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 --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'; 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 --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; drop function f;
select @@sql_mode; select @@sql_mode;

4
mysql-test/main/sp.result
View File

@ -1227,12 +1227,12 @@ n f
19 121645100408832000 19 121645100408832000
20 2432902008176640000 20 2432902008176640000
drop table t3| 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 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 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 procedure ifac|
drop function fac| 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 Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation
drop table if exists t3| drop table if exists t3|
create table t3 ( create table t3 (

4
mysql-test/main/sp.test
View File

@ -1456,11 +1456,11 @@ call ifac(20)|
select * from t3| select * from t3|
drop table t3| drop table t3|
--replace_column 4 'root@localhost' 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00' --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 procedure ifac|
drop function fac| drop function fac|
--replace_column 4 'root@localhost' 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00' --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 # primes

2
mysql-test/main/sp2.result
View File

@ -1,6 +1,6 @@
CREATE DATABASE test1; CREATE DATABASE test1;
CREATE PROCEDURE test1.sp3() BEGIN END; 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 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 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 mtr check_testcase PROCEDURE root@localhost # # DEFINER utf8 utf8_general_ci latin1_swedish_ci

2
mysql-test/main/sp2.test
View File

@ -17,7 +17,7 @@ CREATE DATABASE test1;
CREATE PROCEDURE test1.sp3() BEGIN END; CREATE PROCEDURE test1.sp3() BEGIN END;
--replace_column 5 # 6 # --replace_column 5 # 6 #
SHOW PROCEDURE STATUS; SHOW PROCEDURE STATUS WHERE Db <> 'sys';
# Cleanup # Cleanup
DROP PROCEDURE sp2; DROP PROCEDURE sp2;

102
mysql-test/main/upgrade_MDEV-19650.result
View File

@ -136,6 +136,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -149,6 +249,8 @@ mysqltest1.save_global_priv OK
mysqltest1.save_proxies_priv OK mysqltest1.save_proxies_priv OK
mysqltest1.save_tables_priv OK mysqltest1.save_tables_priv OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

204
mysql-test/main/upgrade_MDEV-23102-1.result
View File

@ -156,6 +156,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -169,6 +269,8 @@ mysqltest1.save_global_priv OK
mysqltest1.save_proxies_priv OK mysqltest1.save_proxies_priv OK
mysqltest1.save_tables_priv OK mysqltest1.save_tables_priv OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
@ -252,6 +354,106 @@ Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -265,6 +467,8 @@ mysqltest1.save_global_priv OK
mysqltest1.save_proxies_priv OK mysqltest1.save_proxies_priv OK
mysqltest1.save_tables_priv OK mysqltest1.save_tables_priv OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

204
mysql-test/main/upgrade_MDEV-23102-2.result
View File

@ -140,6 +140,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -153,6 +253,8 @@ mysqltest1.save_global_priv OK
mysqltest1.save_proxies_priv OK mysqltest1.save_proxies_priv OK
mysqltest1.save_tables_priv OK mysqltest1.save_tables_priv OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
@ -228,6 +330,106 @@ Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -241,6 +443,8 @@ mysqltest1.save_global_priv OK
mysqltest1.save_proxies_priv OK mysqltest1.save_proxies_priv OK
mysqltest1.save_tables_priv OK mysqltest1.save_tables_priv OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

102
mysql-test/main/upgrade_mdev_24363.result
View File

@ -100,6 +100,106 @@ error : Corrupt
Phase 2/7: Installing used storage engines... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views Phase 3/7: Fixing views
mysql.user OK 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 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
@ -109,6 +209,8 @@ mtr
mtr.global_suppressions OK mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
sys
sys.sys_config OK
test test
Phase 7/7: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK

2
mysql-test/main/view.result
View File

@ -610,7 +610,7 @@ insert into t1 values(5,'Hello, world of views');
create view v1 as select * from t1; create view v1 as select * from t1;
create view v2 as select * from v1; create view v2 as select * from v1;
update v2 set col2='Hello, view world'; 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 is_updatable
YES YES
YES YES

2
mysql-test/main/view.test
View File

@ -500,7 +500,7 @@ insert into t1 values(5,'Hello, world of views');
create view v1 as select * from t1; create view v1 as select * from t1;
create view v2 as select * from v1; create view v2 as select * from v1;
update v2 set col2='Hello, view world'; 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; select * from t1;
drop view v2, v1; drop view v2, v1;
drop table t1; drop table t1;

12
mysql-test/mysql-test-run.pl
View File

@ -1730,8 +1730,15 @@ sub collect_mysqld_features {
# Enable or disable ARCHIVE plugin. Possible values are ON, OFF, # Enable or disable ARCHIVE plugin. Possible values are ON, OFF,
# FORCE (don't start if the plugin fails to load), # FORCE (don't start if the plugin fails to load),
# FORCE_PLUS_PERMANENT (like FORCE, but the plugin can not be uninstalled). # 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 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; next;
} }
@ -3090,6 +3097,9 @@ sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/fill_help_tables.sql", mtr_appendfile_to_file("$sql_dir/fill_help_tables.sql",
$bootstrap_sql_file); $bootstrap_sql_file);
# Append sys schema
mtr_appendfile_to_file("$gis_sp_path/mysql_sys_schema.sql",
$bootstrap_sql_file);
# Create test database # Create test database
mtr_appendfile_to_file("$sql_dir/mysql_test_db.sql", mtr_appendfile_to_file("$sql_dir/mysql_test_db.sql",
$bootstrap_sql_file); $bootstrap_sql_file);

1
mysql-test/suite/binlog/r/binlog_database.result
View File

@ -292,4 +292,5 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test

40
mysql-test/suite/engines/funcs/r/db_alter_character_set.result
View File

@ -49,6 +49,7 @@ def information_schema utf8 utf8_general_ci NULL
def mtr latin1 latin1_swedish_ci NULL def mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET ascii; ALTER DATABASE d8 CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET utf8; ALTER DATABASE d8 CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET binary; ALTER DATABASE d8 CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET swe7; ALTER DATABASE d8 CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 CHARACTER SET cp1251; ALTER DATABASE d8 CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET ascii; ALTER DATABASE d8 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET utf8; ALTER DATABASE d8 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET binary; ALTER DATABASE d8 DEFAULT CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET swe7; ALTER DATABASE d8 DEFAULT CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d8 DEFAULT CHARACTER SET cp1251; ALTER DATABASE d8 DEFAULT CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET ascii; ALTER SCHEMA d8 CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET utf8; ALTER SCHEMA d8 CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET binary; ALTER SCHEMA d8 CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET swe7; ALTER SCHEMA d8 CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 CHARACTER SET cp1251; ALTER SCHEMA d8 CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET ascii; ALTER SCHEMA d8 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET utf8; ALTER SCHEMA d8 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET binary; ALTER SCHEMA d8 DEFAULT CHARACTER SET binary;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET swe7; ALTER SCHEMA d8 DEFAULT CHARACTER SET swe7;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;
CREATE 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d8 DEFAULT CHARACTER SET cp1251; ALTER SCHEMA d8 DEFAULT CHARACTER SET cp1251;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d8; DROP DATABASE d8;

12
mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result
View File

@ -7,6 +7,7 @@ def information_schema utf8 utf8_general_ci NULL
def mtr latin1 latin1_swedish_ci NULL def mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d11 CHARACTER SET utf8 COLLATE utf8_general_ci; ALTER DATABASE d11 CHARACTER SET utf8 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11; DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d11 CHARACTER SET latin2 COLLATE latin2_general_ci; ALTER DATABASE d11 CHARACTER SET latin2 COLLATE latin2_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11; DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d11 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci; ALTER DATABASE d11 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11; DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d11 CHARACTER SET utf8 COLLATE utf8_general_ci; ALTER SCHEMA d11 CHARACTER SET utf8 COLLATE utf8_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11; DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d11 CHARACTER SET latin2 COLLATE latin2_general_ci; ALTER SCHEMA d11 CHARACTER SET latin2 COLLATE latin2_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11; DROP DATABASE d11;
CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d11 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci; ALTER SCHEMA d11 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d11; DROP DATABASE d11;

16
mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
View File

@ -331,6 +331,7 @@ def information_schema utf8 utf8_general_ci NULL
def mtr latin1 latin1_swedish_ci NULL def mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 COLLATE ascii_bin; ALTER DATABASE d9 COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 DEFAULT COLLATE ascii_bin; ALTER DATABASE d9 DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 COLLATE ascii_general_ci; ALTER DATABASE d9 COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER DATABASE d9 DEFAULT COLLATE ascii_general_ci; ALTER DATABASE d9 DEFAULT COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 COLLATE ascii_bin; ALTER SCHEMA d9 COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 DEFAULT COLLATE ascii_bin; ALTER SCHEMA d9 DEFAULT COLLATE ascii_bin;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 COLLATE ascii_general_ci; ALTER SCHEMA d9 COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
ALTER SCHEMA d9 DEFAULT COLLATE ascii_general_ci; ALTER SCHEMA d9 DEFAULT COLLATE ascii_general_ci;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d9; DROP DATABASE d9;

168
mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
View File

File diff suppressed because it is too large Load Diff

10
mysql-test/suite/engines/funcs/r/db_create_character_set.result
View File

@ -7,6 +7,7 @@ def information_schema utf8 utf8_general_ci NULL
def mtr latin1 latin1_swedish_ci NULL def mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12; DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET utf8; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12; DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET binary; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12; DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET swe7; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12; DROP DATABASE d12;
CREATE DATABASE d12 CHARACTER SET cp1251; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d12; DROP DATABASE d12;
CREATE SCHEMA d12 CHARACTER SET ascii; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12; DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET utf8; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12; DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET binary; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12; DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET swe7; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12; DROP SCHEMA d12;
CREATE SCHEMA d12 CHARACTER SET cp1251; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d12; DROP SCHEMA d12;

6
mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result
View File

@ -7,6 +7,7 @@ def information_schema utf8 utf8_general_ci NULL
def mtr latin1 latin1_swedish_ci NULL def mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d13; DROP DATABASE d13;
CREATE DATABASE d13 CHARACTER SET latin2 COLLATE latin2_general_ci; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d13; DROP DATABASE d13;
CREATE DATABASE d13 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP DATABASE d13; DROP DATABASE d13;
CREATE SCHEMA d13 CHARACTER SET utf8 COLLATE utf8_general_ci; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d13; DROP SCHEMA d13;
CREATE SCHEMA d13 CHARACTER SET latin2 COLLATE latin2_general_ci; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d13; DROP SCHEMA d13;
CREATE SCHEMA d13 CHARACTER SET cp1250 COLLATE cp1250_croatian_ci; 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 mtr latin1 latin1_swedish_ci NULL
def mysql latin1 latin1_swedish_ci NULL def mysql latin1 latin1_swedish_ci NULL
def performance_schema utf8 utf8_general_ci NULL def performance_schema utf8 utf8_general_ci NULL
def sys utf8 utf8_general_ci NULL
def test latin1 latin1_swedish_ci NULL def test latin1 latin1_swedish_ci NULL
DROP SCHEMA d13; DROP SCHEMA d13;

4
mysql-test/suite/engines/funcs/r/db_create_drop.result
View File

@ -7,6 +7,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
SHOW DATABASES LIKE 'd%'; SHOW DATABASES LIKE 'd%';
Database (d%) Database (d%)
@ -18,6 +19,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
USE d1; USE d1;
DROP DATABASE d1; DROP DATABASE d1;
@ -29,6 +31,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
SHOW SCHEMAS LIKE 'd%'; SHOW SCHEMAS LIKE 'd%';
Database (d%) Database (d%)
@ -40,6 +43,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
USE d1; USE d1;
DROP SCHEMA d1; DROP SCHEMA d1;

2
mysql-test/suite/engines/funcs/r/db_create_error.result
View File

@ -7,6 +7,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
CREATE DATABASE d4; CREATE DATABASE d4;
ERROR HY000: Can't create database 'd4'; database exists ERROR HY000: Can't create database 'd4'; database exists
@ -17,4 +18,5 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test

2
mysql-test/suite/engines/funcs/r/db_create_error_reserved.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
CREATE DATABASE mysql; CREATE DATABASE mysql;
ERROR HY000: Can't create database 'mysql'; database exists ERROR HY000: Can't create database 'mysql'; database exists
@ -13,4 +14,5 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test

2
mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result
View File

@ -10,6 +10,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
USE d2; USE d2;
DROP DATABASE d2; DROP DATABASE d2;
@ -27,6 +28,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
USE d2; USE d2;
DROP SCHEMA d2; DROP SCHEMA d2;

2
mysql-test/suite/engines/funcs/r/db_drop_error.result
View File

@ -7,6 +7,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
DROP DATABASE nond5; DROP DATABASE nond5;
ERROR HY000: Can't drop database 'nond5'; database doesn't exist ERROR HY000: Can't drop database 'nond5'; database doesn't exist
@ -17,4 +18,5 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test

2
mysql-test/suite/engines/funcs/r/db_use_error.result
View File

@ -7,6 +7,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
USE DATABASE nond6; 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 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 mtr
mysql mysql
performance_schema performance_schema
sys
test test

6
mysql-test/suite/funcs_1/datadict/is_routines.inc
View File

@ -185,17 +185,17 @@ FLUSH PRIVILEGES;
--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
connect (testuser1, localhost, testuser1, , db_datadict); connect (testuser1, localhost, testuser1, , db_datadict);
--replace_column 24 "YYYY-MM-DD hh:mm:ss" 25 "YYYY-MM-DD hh:mm:ss" --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 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
connect (testuser2, localhost, testuser2, , db_datadict); connect (testuser2, localhost, testuser2, , db_datadict);
--replace_column 24 "YYYY-MM-DD hh:mm:ss" 25 "YYYY-MM-DD hh:mm:ss" --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 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
connect (testuser3, localhost, testuser3, , test); connect (testuser3, localhost, testuser3, , test);
--replace_column 24 "YYYY-MM-DD hh:mm:ss" 25 "YYYY-MM-DD hh:mm:ss" --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 # Cleanup
connection default; connection default;

4
mysql-test/suite/funcs_1/datadict/is_views.inc
View File

@ -65,9 +65,9 @@ eval SHOW COLUMNS FROM information_schema.$is_table;
# Note: Retrieval of information within information_schema.columns about # Note: Retrieval of information within information_schema.columns about
# information_schema.views is in is_columns_is.test. # 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 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 ################################################################################ --echo ################################################################################

2
mysql-test/suite/funcs_1/r/innodb_trig_0102.result
View File

@ -202,7 +202,7 @@ update t1 set f2='update 3.5.1.7';
select * from t1; select * from t1;
f1 f2 f3 f1 f2 f3
NULL update 3.5.1.7 42 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 trigger_name
gs_insert gs_insert
trg5_1 trg5_1

1
mysql-test/suite/funcs_1/r/is_key_column_usage.result
View File

@ -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 PRIMARY def mysql time_zone_transition_type Transition_type_id
def mysql commit_id def mysql transaction_registry commit_id def mysql commit_id def mysql transaction_registry commit_id
def mysql PRIMARY def mysql transaction_registry transaction_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 # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.KEY_COLUMN_USAGE accessible information
######################################################################################## ########################################################################################

1
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
View File

@ -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 PRIMARY def mysql time_zone_transition_type Transition_type_id
def mysql commit_id def mysql transaction_registry commit_id def mysql commit_id def mysql transaction_registry commit_id
def mysql PRIMARY def mysql transaction_registry transaction_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 # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.KEY_COLUMN_USAGE accessible information
######################################################################################## ########################################################################################

6
mysql-test/suite/funcs_1/r/is_routines.result
View File

@ -188,16 +188,16 @@ TO 'testuser2'@'localhost';
GRANT EXECUTE ON db_datadict_2.* TO 'testuser2'@'localhost'; GRANT EXECUTE ON db_datadict_2.* TO 'testuser2'@'localhost';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
connect testuser1, localhost, testuser1, , db_datadict; 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 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_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 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; 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 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 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; 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 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; connection default;
disconnect testuser1; disconnect testuser1;

12
mysql-test/suite/funcs_1/r/is_routines_embedded.result
View File

@ -188,7 +188,7 @@ TO 'testuser2'@'localhost';
GRANT EXECUTE ON db_datadict_2.* TO 'testuser2'@'localhost'; GRANT EXECUTE ON db_datadict_2.* TO 'testuser2'@'localhost';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
connect testuser1, localhost, testuser1, , db_datadict; 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 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 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; 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; 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 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 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 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 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 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 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 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; 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 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 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; 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; 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 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 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 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 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 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 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 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; 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 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 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; 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; 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 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 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 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 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 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

1
mysql-test/suite/funcs_1/r/is_schemata.result
View File

@ -61,6 +61,7 @@ def information_schema NULL
def mtr NULL def mtr NULL
def mysql NULL def mysql NULL
def performance_schema NULL def performance_schema NULL
def sys NULL
def test NULL def test NULL
############################################################################### ###############################################################################
# Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information # Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information

1
mysql-test/suite/funcs_1/r/is_schemata_embedded.result
View File

@ -61,6 +61,7 @@ def information_schema NULL
def mtr NULL def mtr NULL
def mysql NULL def mysql NULL
def performance_schema NULL def performance_schema NULL
def sys NULL
def test NULL def test NULL
############################################################################### ###############################################################################
# Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information # Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information

1
mysql-test/suite/funcs_1/r/is_statistics.result
View File

@ -154,6 +154,7 @@ def mysql time_zone_transition mysql PRIMARY
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 mysql time_zone_transition_type mysql PRIMARY def mysql time_zone_transition_type mysql PRIMARY
def sys sys_config sys PRIMARY
Warnings: Warnings:
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'
Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB'

1
mysql-test/suite/funcs_1/r/is_table_constraints.result
View File

@ -91,6 +91,7 @@ def mysql PRIMARY mysql time_zone_transition
def mysql PRIMARY mysql time_zone_transition_type def mysql PRIMARY mysql time_zone_transition_type
def mysql commit_id mysql transaction_registry def mysql commit_id mysql transaction_registry
def mysql PRIMARY 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 # Testcase 3.2.7.2 + 3.2.7.3: INFORMATION_SCHEMA.TABLE_CONSTRAINTS accessible information
######################################################################################### #########################################################################################

10
mysql-test/suite/funcs_1/r/is_triggers.result
View File

@ -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 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 gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci def mtr 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 # Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information
################################################################################## ##################################################################################

10
mysql-test/suite/funcs_1/r/is_triggers_embedded.result
View File

@ -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 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 gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci def mtr 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 # Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information
################################################################################## ##################################################################################

3
mysql-test/suite/funcs_1/r/is_views.result
View File

@ -68,9 +68,8 @@ CHARACTER_SET_CLIENT varchar(32) NO
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO
ALGORITHM varchar(10) NO ALGORITHM varchar(10) NO
SELECT table_catalog, table_schema, table_name 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 table_catalog table_schema table_name
def mysql user
################################################################################ ################################################################################
# Testcase 3.2.13.2 + 3.2.13.3: INFORMATION_SCHEMA.VIEWS accessible information # Testcase 3.2.13.2 + 3.2.13.3: INFORMATION_SCHEMA.VIEWS accessible information
################################################################################ ################################################################################

3
mysql-test/suite/funcs_1/r/is_views_embedded.result
View File

@ -68,9 +68,8 @@ CHARACTER_SET_CLIENT varchar(32) NO
COLLATION_CONNECTION varchar(32) NO COLLATION_CONNECTION varchar(32) NO
ALGORITHM varchar(10) NO ALGORITHM varchar(10) NO
SELECT table_catalog, table_schema, table_name 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 table_catalog table_schema table_name
def mysql user
################################################################################ ################################################################################
# Testcase 3.2.13.2 + 3.2.13.3: INFORMATION_SCHEMA.VIEWS accessible information # Testcase 3.2.13.2 + 3.2.13.3: INFORMATION_SCHEMA.VIEWS accessible information
################################################################################ ################################################################################

2
mysql-test/suite/funcs_1/r/memory_trig_0102.result
View File

@ -203,7 +203,7 @@ update t1 set f2='update 3.5.1.7';
select * from t1; select * from t1;
f1 f2 f3 f1 f2 f3
NULL update 3.5.1.7 42 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 trigger_name
gs_insert gs_insert
trg5_1 trg5_1

2
mysql-test/suite/funcs_1/r/myisam_trig_0102.result
View File

@ -203,7 +203,7 @@ update t1 set f2='update 3.5.1.7';
select * from t1; select * from t1;
f1 f2 f3 f1 f2 f3
NULL update 3.5.1.7 42 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 trigger_name
gs_insert gs_insert
trg5_1 trg5_1

2
mysql-test/suite/funcs_1/triggers/triggers_0102.inc
View File

@ -235,7 +235,7 @@ let $message= Testcase 3.5.1.7: - need to fix;
select * from t1; select * from t1;
update t1 set f2='update 3.5.1.7'; update t1 set f2='update 3.5.1.7';
select * from t1; 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 #Cleanup
--disable_warnings --disable_warnings

1
mysql-test/suite/galera/r/MW-416.result
View File

@ -110,4 +110,5 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test

18
mysql-test/suite/innodb_zip/r/innodb-zip.result
View File

@ -62,7 +62,7 @@ row_format=compressed;
create table t14(a int primary key) engine=innodb key_block_size=9; create table t14(a int primary key) engine=innodb key_block_size=9;
Warnings: Warnings:
Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=9. 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t0 Dynamic {valid} 0 mysqltest_innodb_zip t0 Dynamic {valid} 0
mysqltest_innodb_zip t00 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; 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 key_block_size=0;
alter table t1 row_format=dynamic; 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t1 Dynamic {valid} 0 mysqltest_innodb_zip t1 Dynamic {valid} 0
alter table t1 row_format=compact; 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t1 Compact {valid} 0 mysqltest_innodb_zip t1 Compact {valid} 0
alter table t1 row_format=redundant; 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t1 Redundant {valid} 0 mysqltest_innodb_zip t1 Redundant {valid} 0
drop table t1; 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 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 Warning Engine-independent statistics are not collected for column 'b'
mysqltest_innodb_zip.t2 analyze status OK 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t1 Compressed 2048 1024 mysqltest_innodb_zip t1 Compressed 2048 1024
mysqltest_innodb_zip t2 Dynamic {valid} 0 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 t9 (id int primary key) engine = innodb row_format = dynamic;
create table t10(id int primary key) engine = innodb row_format = compact; create table t10(id int primary key) engine = innodb row_format = compact;
create table t11(id int primary key) engine = innodb row_format = redundant; 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t1 Dynamic {valid} 0 mysqltest_innodb_zip t1 Dynamic {valid} 0
mysqltest_innodb_zip t10 Compact {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 Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB
create table t5 (id int primary key) engine = innodb create table t5 (id int primary key) engine = innodb
key_block_size = 4 row_format = default; 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t1 Compressed 4096 0 mysqltest_innodb_zip t1 Compressed 4096 0
mysqltest_innodb_zip t5 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. 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") 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 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 table_schema table_name row_format data_length index_length
set global innodb_file_per_table = off; set global innodb_file_per_table = off;
create table t1 (id int primary key) engine = innodb key_block_size = 1; create table t1 (id int primary key) engine = innodb key_block_size = 1;
@ -280,7 +280,7 @@ show warnings;
Level Code Message Level Code Message
create table t8 (id int primary key) engine = innodb row_format = compact; create table t8 (id int primary key) engine = innodb row_format = compact;
create table t9 (id int primary key) engine = innodb row_format = redundant; 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 table_schema table_name row_format data_length index_length
mysqltest_innodb_zip t7 Dynamic {valid} 0 mysqltest_innodb_zip t7 Dynamic {valid} 0
mysqltest_innodb_zip t8 Compact {valid} 0 mysqltest_innodb_zip t8 Compact {valid} 0

2
mysql-test/suite/innodb_zip/t/innodb-zip.test
View File

@ -9,7 +9,7 @@ SELECT table_name, row_format, data_length, index_length
let $per_table=`select @@innodb_file_per_table`; let $per_table=`select @@innodb_file_per_table`;
SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; 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 session innodb_strict_mode=0;
set global innodb_file_per_table=off; set global innodb_file_per_table=off;

1
mysql-test/suite/jp/r/jp_create_db_sjis.result
View File

@ -11,6 +11,7 @@ schema_name
information_schema information_schema
mysql mysql
performance_schema performance_schema
sys
test test
<EFBFBD>\<5C>\<5C>\ <EFBFBD>\<5C>\<5C>\
<EFBFBD><EFBFBD><EFBFBD>{<7B><> <EFBFBD><EFBFBD><EFBFBD>{<7B><>

1
mysql-test/suite/jp/r/jp_create_db_ucs2.result
View File

@ -12,6 +12,7 @@ schema_name
information_schema information_schema
mysql mysql
performance_schema performance_schema
sys
test test
<EFBFBD><EFBFBD><EFBFBD>ܸ<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>ܸ<EFBFBD>
<EFBFBD><EFBFBD>܏<EFBFBD>ݏ<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>܏<EFBFBD>ݏ<EFBFBD><EFBFBD>

1
mysql-test/suite/jp/r/jp_create_db_ujis.result
View File

@ -11,6 +11,7 @@ schema_name
information_schema information_schema
mysql mysql
performance_schema performance_schema
sys
test test
<EFBFBD><EFBFBD><EFBFBD>ܸ<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>ܸ<EFBFBD>
<EFBFBD><EFBFBD>܏<EFBFBD>ݏ<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>܏<EFBFBD>ݏ<EFBFBD><EFBFBD>

1
mysql-test/suite/jp/r/jp_create_db_utf8.result
View File

@ -11,6 +11,7 @@ schema_name
information_schema information_schema
mysql mysql
performance_schema performance_schema
sys
test test
日本語 日本語
龔龖龗 龔龖龗

1
mysql-test/suite/perfschema/r/max_program_zero.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_disable_idle.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_disable_stages.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_disable_statements.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_disable_transactions.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_disable_waits.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_innodb.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_low_index.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_low_table_lock.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_account.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_cond_class.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_file_class.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_file_inst.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_host.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_index.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

1
mysql-test/suite/perfschema/r/start_server_no_mdl.result
View File

@ -4,6 +4,7 @@ information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
sys
test test
select count(*) from performance_schema.performance_timers; select count(*) from performance_schema.performance_timers;
count(*) count(*)

Some files were not shown because too many files have changed in this diff Show More