From c845005e8f075a71849808fdace285e1989f88af Mon Sep 17 00:00:00 2001 From: SPZhang <31213457+zsp108@users.noreply.github.com> Date: Mon, 1 Aug 2022 14:48:29 +0800 Subject: [PATCH] fix(mtr):move character_set to test.character_set, fix main mtr_test and innodb mtr_test(#277) (#335) * fix(mtr):fix innodb mtr and mv some test to test/innodb * fix(mtr):move character_set to test/main/ fix(mtr):mv main mtr character_set test to test/main/cahracter_set fix(mtr):mv myisam error mtr-test to test/main/myisam fix(mtr):add optimizer_switch to include/default_mysqld.cnf * fix(mtr):fix main mtr optimizer_switch amd mv some test to test/main Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- mysql-test/include/default_mysqld.cnf | 2 + mysql-test/r/mysqld--help-notwin.result | 4 +- mysql-test/r/mysqld_daemon.result | 2 + mysql-test/r/mysqld_safe.result | 4 + mysql-test/r/mysqldump_bugs.result | 2 +- mysql-test/r/mysqlpump_extended.result | 4 + .../innodb/r/innodb-system-table-view.result | 2 +- .../suite/innodb/r/innodb-wl5980-linux.result | 442 +----------------- mysql-test/suite/innodb/r/log_file.result | 60 +++ .../suite/innodb/r/partition-upgrade.result | 8 + mysql-test/t/mysqlpump_basic.test | 8 +- mysql-test/t/mysqlpump_bugs.test | 2 +- mysql-test/t/mysqlpump_extended.test | 20 +- .../innodb/character_set}/innodb-alter.test | 0 .../character_set}/innodb-wl5980-alter.test | 0 .../innodb}/import_compress_encrypt.test | 0 .../innodb_pagesize_max_recordsize.test | 0 .../innodb}/mysqldump_max_recordsize.test | 0 .../innodb}/optimizer_temporary_table.test | 0 .../main/character_set}/create.test | 0 .../main}/character_set/ctype_latin1.test | 0 .../main}/character_set/ctype_recoding.test | 0 .../main}/character_set/ddl_i18n_koi8r.test | 0 .../main}/character_set/ddl_i18n_utf8.test | 0 .../main/character_set}/events_1.test | 0 .../main}/character_set/events_2.test | 0 .../main}/character_set/events_bugs.test | 0 .../main}/character_set/explain.test | 0 .../{ => test/main}/character_set/grant.test | 0 .../character_set}/information_schema.test | 0 .../main}/character_set/lowercase_table.test | 0 .../main/character_set}/mysqldump.test | 0 .../character_set/mysqlpump_charset.test | 0 .../main}/character_set/opt_hints.test | 0 .../character_set/partition_charset.test | 0 .../main}/character_set/plugin_auth.test | 0 .../main}/character_set/show_check.test | 0 .../{ => test/main}/character_set/sp.test | 0 mysql-test/{t => test/main}/gis-precise.test | 0 mysql-test/{t => test/main}/gis.test | 0 .../main/myisam}/index_merge_myisam.test | 0 .../{t => test/main/myisam}/myisam.test | 0 .../myisam_explain_json_non_select_all.test | 0 .../myisam_explain_json_non_select_none.test | 0 .../{t => test/main/myisam}/myisampack.test | 0 .../main}/mysql_client_test-master.opt | 0 .../{t => test/main}/mysql_client_test.test | 0 .../{t => test/main}/mysql_plugin-master.opt | 0 mysql-test/{t => test/main}/mysql_plugin.test | 0 mysql-test/{t => test/main}/mysqld_safe.sh | 0 mysql-test/{t => test/main}/mysqld_safe.test | 0 .../main/optimizer_switch}/derived.test | 0 .../main/optimizer_switch}/heap.test | 0 .../opt_costmodel_flush.test | 0 .../optimizer_switch}/optimizer_switch.test | 0 .../main/optimizer_switch}/subquery_bugs.test | 0 .../subquery_sj_dupsweed-master.opt | 0 .../subquery_sj_dupsweed.test | 0 .../subquery_sj_dupsweed_bka.test | 0 ...subquery_sj_dupsweed_bka_nixbnl-master.opt | 0 .../subquery_sj_dupsweed_bka_nixbnl.test | 0 .../optimizer_switch}/subselect_innodb.test | 0 .../main/optimizer_switch}/view.test | 0 mysql-test/{t => test/main}/type_float.test | 0 .../{t => test/main}/type_string-master.opt | 0 mysql-test/{t => test/main}/type_string.test | 0 66 files changed, 100 insertions(+), 460 deletions(-) rename mysql-test/{suite/innodb/t => test/innodb/character_set}/innodb-alter.test (100%) rename mysql-test/{suite/innodb/t => test/innodb/character_set}/innodb-wl5980-alter.test (100%) rename mysql-test/{suite/innodb/t => test/innodb}/import_compress_encrypt.test (100%) rename mysql-test/{suite/innodb/t => test/innodb}/innodb_pagesize_max_recordsize.test (100%) rename mysql-test/{suite/innodb/t => test/innodb}/mysqldump_max_recordsize.test (100%) rename mysql-test/{suite/innodb/t => test/innodb}/optimizer_temporary_table.test (100%) rename mysql-test/{t => test/main/character_set}/create.test (100%) rename mysql-test/{ => test/main}/character_set/ctype_latin1.test (100%) rename mysql-test/{ => test/main}/character_set/ctype_recoding.test (100%) rename mysql-test/{ => test/main}/character_set/ddl_i18n_koi8r.test (100%) rename mysql-test/{ => test/main}/character_set/ddl_i18n_utf8.test (100%) rename mysql-test/{t => test/main/character_set}/events_1.test (100%) rename mysql-test/{ => test/main}/character_set/events_2.test (100%) rename mysql-test/{ => test/main}/character_set/events_bugs.test (100%) rename mysql-test/{ => test/main}/character_set/explain.test (100%) rename mysql-test/{ => test/main}/character_set/grant.test (100%) rename mysql-test/{t => test/main/character_set}/information_schema.test (100%) rename mysql-test/{ => test/main}/character_set/lowercase_table.test (100%) rename mysql-test/{t => test/main/character_set}/mysqldump.test (100%) rename mysql-test/{ => test/main}/character_set/mysqlpump_charset.test (100%) rename mysql-test/{ => test/main}/character_set/opt_hints.test (100%) rename mysql-test/{ => test/main}/character_set/partition_charset.test (100%) rename mysql-test/{ => test/main}/character_set/plugin_auth.test (100%) rename mysql-test/{ => test/main}/character_set/show_check.test (100%) rename mysql-test/{ => test/main}/character_set/sp.test (100%) rename mysql-test/{t => test/main}/gis-precise.test (100%) rename mysql-test/{t => test/main}/gis.test (100%) rename mysql-test/{t => test/main/myisam}/index_merge_myisam.test (100%) rename mysql-test/{t => test/main/myisam}/myisam.test (100%) rename mysql-test/{t => test/main/myisam}/myisam_explain_json_non_select_all.test (100%) rename mysql-test/{t => test/main/myisam}/myisam_explain_json_non_select_none.test (100%) rename mysql-test/{t => test/main/myisam}/myisampack.test (100%) rename mysql-test/{t => test/main}/mysql_client_test-master.opt (100%) rename mysql-test/{t => test/main}/mysql_client_test.test (100%) rename mysql-test/{t => test/main}/mysql_plugin-master.opt (100%) rename mysql-test/{t => test/main}/mysql_plugin.test (100%) rename mysql-test/{t => test/main}/mysqld_safe.sh (100%) rename mysql-test/{t => test/main}/mysqld_safe.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/derived.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/heap.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/opt_costmodel_flush.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/optimizer_switch.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/subquery_bugs.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/subquery_sj_dupsweed-master.opt (100%) rename mysql-test/{t => test/main/optimizer_switch}/subquery_sj_dupsweed.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/subquery_sj_dupsweed_bka.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/subquery_sj_dupsweed_bka_nixbnl-master.opt (100%) rename mysql-test/{t => test/main/optimizer_switch}/subquery_sj_dupsweed_bka_nixbnl.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/subselect_innodb.test (100%) rename mysql-test/{t => test/main/optimizer_switch}/view.test (100%) rename mysql-test/{t => test/main}/type_float.test (100%) rename mysql-test/{t => test/main}/type_string-master.opt (100%) rename mysql-test/{t => test/main}/type_string.test (100%) diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 21719b81b..c27e226a0 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -27,6 +27,8 @@ slave-net-timeout=120 log-bin=mysqld-bin +optimizer_switch='index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on' + # MAINTAINER: # the loose- syntax is to make sure the cnf file is also # valid when building without the performance schema. diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result index d28dc6967..e9e6573f0 100644 --- a/mysql-test/r/mysqld--help-notwin.result +++ b/mysql-test/r/mysqld--help-notwin.result @@ -1404,11 +1404,11 @@ block-encryption-mode aes-128-ecb bulk-insert-buffer-size 8388608 character-set-client-handshake TRUE character-set-filesystem binary -character-set-server utf8mb4 +character-set-server utf8 character-sets-dir MYSQL_CHARSETSDIR/ check-proxy-users FALSE chroot (No default value) -collation-server utf8mb4_general_ci +collation-server utf8_general_ci completion-type NO_CHAIN concurrent-insert AUTO connect-timeout 10 diff --git a/mysql-test/r/mysqld_daemon.result b/mysql-test/r/mysqld_daemon.result index 4f2c19917..f7ada6d5c 100644 --- a/mysql-test/r/mysqld_daemon.result +++ b/mysql-test/r/mysqld_daemon.result @@ -1,7 +1,9 @@ Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test diff --git a/mysql-test/r/mysqld_safe.result b/mysql-test/r/mysqld_safe.result index 63aba94c6..8c98d5e82 100644 --- a/mysql-test/r/mysqld_safe.result +++ b/mysql-test/r/mysqld_safe.result @@ -1,15 +1,19 @@ use test; Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test Database information_schema +cache mtr mysql performance_schema sys +sys_stonedb test diff --git a/mysql-test/r/mysqldump_bugs.result b/mysql-test/r/mysqldump_bugs.result index 875b0e622..b5c6d9f24 100644 --- a/mysql-test/r/mysqldump_bugs.result +++ b/mysql-test/r/mysqldump_bugs.result @@ -81,7 +81,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db4` /*!40100 DEFAULT CHARACTER SET la USE `db4`; -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mtr` /*!40100 DEFAULT CHARACTER SET utf8mb4 */; +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mtr` /*!40100 DEFAULT CHARACTER SET utf8 */; USE `mtr`; diff --git a/mysql-test/r/mysqlpump_extended.result b/mysql-test/r/mysqlpump_extended.result index 191540c5e..09ad674de 100644 --- a/mysql-test/r/mysqlpump_extended.result +++ b/mysql-test/r/mysqlpump_extended.result @@ -18,11 +18,13 @@ DROP DATABASE db1_extended; SHOW DATABASES; Database information_schema +cache db2_extended mtr mysql performance_schema sys +sys_stonedb test DROP DATABASE db2_extended; # test exclude-events @@ -171,12 +173,14 @@ DROP DATABASE db4_extended; SHOW DATABASES; Database information_schema +cache db2_extended db4_extended mtr mysql performance_schema sys +sys_stonedb test DROP DATABASE db2_extended; DROP DATABASE db4_extended; diff --git a/mysql-test/suite/innodb/r/innodb-system-table-view.result b/mysql-test/suite/innodb/r/innodb-system-table-view.result index e0c1078f3..288b51ceb 100644 --- a/mysql-test/suite/innodb/r/innodb-system-table-view.result +++ b/mysql-test/suite/innodb/r/innodb-system-table-view.result @@ -74,7 +74,7 @@ table_id pos mtype prtype len name 25 4 13 2163198 24 Abbreviation 26 0 6 1288 8 Transition_time 26 1 6 1283 4 Correction -32 0 13 2949630 144 source_uuid +32 0 13 2163198 108 source_uuid 32 1 6 1288 8 interval_start 32 2 6 1288 8 interval_end 33 0 12 2162959 192 cost_name diff --git a/mysql-test/suite/innodb/r/innodb-wl5980-linux.result b/mysql-test/suite/innodb/r/innodb-wl5980-linux.result index 480945c76..75eb1a960 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5980-linux.result +++ b/mysql-test/suite/innodb/r/innodb-wl5980-linux.result @@ -14,447 +14,7 @@ # table to deal with the restriction added to plugin value for users # in WL6982. Run mysql_upgrade once -mysql_upgrade: [ERROR] 3003: Storage engine for table 'performance_schema'.'accounts' is not loaded. -mysql_upgrade: [ERROR] 1007: Can't create database 'performance_schema'; database exists -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/cond_instances.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_current.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_history.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_history_long.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_account_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_thread_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_instances.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/socket_instances.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/socket_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/socket_summary_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/host_cache.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/mutex_instances.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/objects_summary_global_by_type.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/performance_timers.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/rwlock_instances.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/setup_actors.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/setup_consumers.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/setup_instruments.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/setup_objects.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/setup_timers.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_index_usage.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_table.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_lock_waits_summary_by_table.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/threads.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_current.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_history.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_history_long.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_thread_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_account_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_current.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_history.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_history_long.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_thread_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_account_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/hosts.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/users.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/accounts.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE -mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to DEALLOCATE PREPARE -mysql_upgrade: [ERROR] 1072: Key column 'Id' doesn't exist in table -mysql.columns_priv OK -mysql.db OK -mysql.engine_cost OK -mysql.event OK -mysql.func OK -mysql.general_log OK -mysql.gtid_executed OK -mysql.help_category OK -mysql.help_keyword OK -mysql.help_relation OK -mysql.help_topic OK -mysql.host OK -mysql.innodb_index_stats OK -mysql.innodb_table_stats OK -mysql.ndb_binlog_index OK -mysql.plugin OK -mysql.proc OK -mysql.procs_priv OK -mysql.proxies_priv OK -mysql.server_cost OK -mysql.servers OK -mysql.slave_master_info OK -mysql.slave_relay_log_info OK -mysql.slave_worker_info OK -mysql.slow_log OK -mysql.tables_priv OK -mysql.time_zone OK -mysql.time_zone_leap_second OK -mysql.time_zone_name OK -mysql.time_zone_transition OK -mysql.time_zone_transition_type OK -mysql.user OK -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_history_long.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_history_long.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_thread_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_thread_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/threads.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/threads.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_index_usage.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_index_usage.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/file_summary_by_instance.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_table.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_table.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_table.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_table.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_index_usage.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_index_usage.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/table_io_waits_summary_by_index_usage.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/threads.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/threads.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1146: Table 'sys.x$ps_digest_avg_latency_distribution' doesn't exist -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_digest.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/accounts.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/accounts.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_statements_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_stages_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/accounts.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/accounts.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_user_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_by_host_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/events_waits_summary_global_by_event_name.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/setup_instruments.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/threads.frm' -mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/threads.frm' -mysql_upgrade: [ERROR] 1146: Table 'sys.processlist' doesn't exist -mysql_upgrade: [ERROR] 1146: Table 'sys.x$processlist' doesn't exist -sys.sys_config OK -sys_stonedb.column_ttl OK -sys_stonedb.columns OK -sys_stonedb.decomposition_dictionary OK -sys_stonedb.logs OK -test.emp1 OK -test.emp2 -error : Partitioning upgrade required. Please dump/reload to fix it or do: ALTER TABLE `test`.`emp2` UPGRADE PARTITIONING -warning : The partition engine, used by table 'test.emp2', is deprecated and will be removed in a future release. Please use native partitioning instead. -test.emp3 OK -test.emp4 -error : Partitioning upgrade required. Please dump/reload to fix it or do: ALTER TABLE `test`.`emp4` UPGRADE PARTITIONING -warning : The partition engine, used by table 'test.emp4', is deprecated and will be removed in a future release. Please use native partitioning instead. -test.purchase -error : Partitioning upgrade required. Please dump/reload to fix it or do: ALTER TABLE `test`.`purchase` UPGRADE PARTITIONING -warning : The partition engine, used by table 'test.purchase', is deprecated and will be removed in a future release. Please use native partitioning instead. - -Upgrading tables -Running : ALTER TABLE `test`.`emp2` UPGRADE PARTITIONING -status : OK -Running : ALTER TABLE `test`.`emp4` UPGRADE PARTITIONING -status : OK -Running : ALTER TABLE `test`.`purchase` UPGRADE PARTITIONING -status : OK -# Stop server -# Check the DB & tables with DML statements. -use test; -SHOW CREATE TABLE emp1; -Table Create Table -emp1 CREATE TABLE `emp1` ( - `empno` int(11) DEFAULT NULL, - `ename` varchar(30) DEFAULT NULL, - `sal` decimal(3,0) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -SHOW CREATE TABLE emp2; -Table Create Table -emp2 CREATE TABLE `emp2` ( - `empno` int(11) DEFAULT NULL, - `ename` varchar(30) DEFAULT NULL, - `sal` decimal(3,0) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY HASH (empno) -(PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab1' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab2' ENGINE = InnoDB) */ -SHOW CREATE TABLE emp3; -Table Create Table -emp3 CREATE TABLE `emp3` ( - `empno` int(11) DEFAULT NULL, - `ename` varchar(30) DEFAULT NULL, - `sal` decimal(3,0) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/mysqld.5980/tab3/' -SHOW CREATE TABLE emp4; -Table Create Table -emp4 CREATE TABLE `emp4` ( - `empno` int(11) DEFAULT NULL, - `ename` varchar(30) DEFAULT NULL, - `sal` decimal(3,0) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC -/*!50100 PARTITION BY HASH (empno) -(PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab4' ENGINE = InnoDB, - PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab5' ENGINE = InnoDB) */ -SHOW CREATE TABLE purchase; -Table Create Table -purchase CREATE TABLE `purchase` ( - `id` int(11) DEFAULT NULL, - `purchased` date DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -/*!50100 PARTITION BY RANGE ( YEAR(purchased)) -SUBPARTITION BY HASH ( TO_DAYS(purchased)) -(PARTITION p0 VALUES LESS THAN (1990) - (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part0' ENGINE = InnoDB, - SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part1' ENGINE = InnoDB), - PARTITION p1 VALUES LESS THAN (2000) - (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part2' ENGINE = InnoDB, - SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part3' ENGINE = InnoDB)) */ -SELECT COUNT(*) FROM emp1; -COUNT(*) -2 -SELECT COUNT(*) FROM emp2; -COUNT(*) -2 -SELECT COUNT(*) FROM emp3; -COUNT(*) -2 -SELECT COUNT(*) FROM emp4; -COUNT(*) -2 -SELECT COUNT(*) FROM purchase; -COUNT(*) -1 -DELETE FROM emp1; -DELETE FROM emp2; -DELETE FROM emp3; -DELETE FROM emp4; -DELETE FROM purchase; -SELECT COUNT(*) FROM emp1; -COUNT(*) -0 -SELECT COUNT(*) FROM emp2; -COUNT(*) -0 -SELECT COUNT(*) FROM emp3; -COUNT(*) -0 -SELECT COUNT(*) FROM emp4; -COUNT(*) -0 -SELECT COUNT(*) FROM purchase; -COUNT(*) -0 -# Check the system tables have the proper entry of the tables. -=== information_schema.innodb_sys_tablespaces and innodb_sys_datafiles === -Space_Name Space_Type Page_Size Zip_Size Formats_Permitted Path -test/emp1 Single DEFAULT 0 Compact or Redundant .\test\emp1.ibd -test/emp2#p#p1 Single DEFAULT 0 Compact or Redundant MYSQL_TMP_DIR/mysqld.5980/tab1/test/emp2#p#p1.ibd -test/emp2#p#p2 Single DEFAULT 0 Compact or Redundant MYSQL_TMP_DIR/mysqld.5980/tab2/test/emp2#p#p2.ibd -test/emp3 Single DEFAULT 0 Compact or Redundant MYSQL_TMP_DIR/mysqld.5980/tab3/test/emp3.ibd -test/purchase#p#p0#sp#s0 Single DEFAULT 0 Compact or Redundant MYSQL_TMP_DIR/mysqld.5980/part0/test/purchase#p#p0#sp#s0.ibd -test/purchase#p#p0#sp#s1 Single DEFAULT 0 Compact or Redundant MYSQL_TMP_DIR/mysqld.5980/part1/test/purchase#p#p0#sp#s1.ibd -test/purchase#p#p1#sp#s2 Single DEFAULT 0 Compact or Redundant MYSQL_TMP_DIR/mysqld.5980/part2/test/purchase#p#p1#sp#s2.ibd -test/purchase#p#p1#sp#s3 Single DEFAULT 0 Compact or Redundant MYSQL_TMP_DIR/mysqld.5980/part3/test/purchase#p#p1#sp#s3.ibd -test/emp4#p#p1 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/mysqld.5980/tab4/test/emp4#p#p1.ibd -test/emp4#p#p2 Single DEFAULT 0 Dynamic MYSQL_TMP_DIR/mysqld.5980/tab5/test/emp4#p#p2.ibd -=== information_schema.files === -Space_Name File_Type Engine Status Tablespace_Name Path -test/emp1 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQLD_DATADIR/test/emp1.ibd -test/emp2#p#p1 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/tab1/test/emp2#p#p1.ibd -test/emp2#p#p2 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/tab2/test/emp2#p#p2.ibd -test/emp3 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/tab3/test/emp3.ibd -test/purchase#p#p0#sp#s0 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/part0/test/purchase#p#p0#sp#s0.ibd -test/purchase#p#p0#sp#s1 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/part1/test/purchase#p#p0#sp#s1.ibd -test/purchase#p#p1#sp#s2 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/part2/test/purchase#p#p1#sp#s2.ibd -test/purchase#p#p1#sp#s3 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/part3/test/purchase#p#p1#sp#s3.ibd -test/emp4#p#p1 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/tab4/test/emp4#p#p1.ibd -test/emp4#p#p2 TABLESPACE InnoDB NORMAL innodb_file_per_table.## MYSQL_TMP_DIR/mysqld.5980/tab5/test/emp4#p#p2.ibd -=== information_schema.innodb_sys_tables and innodb_sys_tablespaces === -Table Name Tablespace Table Flags Columns Row Format Zip Size Space Type -test/emp1 test/emp1 1 6 Compact 0 Single -test/emp2#p#p1 test/emp2#p#p1 65 6 Compact 0 Single -test/emp2#p#p2 test/emp2#p#p2 65 6 Compact 0 Single -test/emp3 test/emp3 65 6 Compact 0 Single -test/emp4#p#p1 test/emp4#p#p1 97 6 Dynamic 0 Single -test/emp4#p#p2 test/emp4#p#p2 97 6 Dynamic 0 Single -test/purchase#p#p0#sp#s0 test/purchase#p#p0#sp#s0 65 5 Compact 0 Single -test/purchase#p#p0#sp#s1 test/purchase#p#p0#sp#s1 65 5 Compact 0 Single -test/purchase#p#p1#sp#s2 test/purchase#p#p1#sp#s2 65 5 Compact 0 Single -test/purchase#p#p1#sp#s3 test/purchase#p#p1#sp#s3 65 5 Compact 0 Single -# -# Cleanup -# -DROP TABLE emp1; -DROP TABLE emp2; -DROP TABLE emp3; -DROP TABLE emp4; -DROP TABLE purchase; -CREATE DATABASE mtr; -CREATE PROCEDURE mtr.check_warnings(OUT result INT) -BEGIN -SELECT 0 INTO RESULT; -END| -# Set the environmental variables -# Stop server -# Copy the remote tablespace & DB zip files from suite location to working location. -# Check that the file exists in the working folder. -# Unzip the zip file. -# Remove the DOS based *.isl files from the MySql Data directory. -# Check that the *.ibd files are in the required location. -# Create new *.isl files with the correct path to the *.ibd files, -# Restart the DB server from unzip location Data Dir. -# Note that lower case option is required because the -# partition tables will be stored in mixed (Upper & Lower) format on Linux, -# but on Windows the partition table names are stored in lower case only. -# Restarting the server with skip-grant-tables and updating mysql.user -# table to deal with the restriction added to plugin value for users -# in WL6982. -Run mysql_upgrade once -mysql_upgrade: [ERROR] 3003: Storage engine for table 'performance_schema'.'accounts' is not loaded. +mysql_upgrade: [ERROR] 3003: Storage engine for table 'performance_schema'.'events_stages_history' is not loaded. mysql_upgrade: [ERROR] 1007: Can't create database 'performance_schema'; database exists mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schema/cond_instances.frm' mysql_upgrade: [ERROR] 1243: Unknown prepared statement handler (stmt) given to EXECUTE diff --git a/mysql-test/suite/innodb/r/log_file.result b/mysql-test/suite/innodb/r/log_file.result index a1ebdf037..6ccef8679 100644 --- a/mysql-test/suite/innodb/r/log_file.result +++ b/mysql-test/suite/innodb/r/log_file.result @@ -13,6 +13,8 @@ my_restart.err # Start mysqld to create tablespaces according to my.cnf # Backup tmp/logfile/* # 1. With ibdata2, Without ibdata1 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -21,6 +23,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -32,6 +35,8 @@ undo001 undo002 undo003 # 2. With ibdata1, without ibdata2 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -40,6 +45,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -52,6 +58,8 @@ undo001 undo002 undo003 # 3. Without ibdata1 & ibdata2 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -60,6 +68,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -69,6 +78,8 @@ my_restart.err undo001 undo002 undo003 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -77,6 +88,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -87,6 +99,8 @@ undo001 undo002 undo003 # 4. Without ibdata*, ib_logfile* and with undo00* +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -95,12 +109,15 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool my.cnf my_restart.err undo001 undo002 undo003 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -109,6 +126,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool my.cnf my_restart.err @@ -116,6 +134,8 @@ undo001 undo002 undo003 # 5. Without ibdata*,ib_logfile* files & Without undo002 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -124,11 +144,14 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool my.cnf my_restart.err undo001 undo003 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -137,12 +160,15 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool my.cnf my_restart.err undo001 undo003 # 6. Without ibdata*,ib_logfile* files & Without undo001, undo002 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -151,10 +177,13 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool my.cnf my_restart.err undo003 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -163,11 +192,14 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool my.cnf my_restart.err undo003 # 7. With ibdata files & Without undo002 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -176,6 +208,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -186,6 +219,8 @@ my.cnf my_restart.err undo001 undo003 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -194,6 +229,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -205,6 +241,8 @@ my_restart.err undo001 undo003 # 8. With ibdata files & Without undo001, undo002 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -213,6 +251,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -222,6 +261,8 @@ ibdata2 my.cnf my_restart.err undo003 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -230,6 +271,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -240,6 +282,8 @@ my.cnf my_restart.err undo003 # 9. Without ibdata*, without undo*, Without ib_logfile1 and with ib_logfile2 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -248,11 +292,14 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile2 my.cnf my_restart.err +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -261,12 +308,15 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile2 my.cnf my_restart.err # 11. With ibdata*, without ib_logfile1 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -275,6 +325,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile2 @@ -285,6 +336,8 @@ my_restart.err undo001 undo002 undo003 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -293,6 +346,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile2 @@ -304,6 +358,8 @@ undo001 undo002 undo003 # 12. With ibdata*, without ib_logfile2 +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -312,6 +368,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 @@ -323,6 +380,8 @@ undo001 undo002 undo003 # Cleanup +.index +STONEDB_INSERT_BUFFER bak_ib_logfile0 bak_ib_logfile1 bak_ib_logfile2 @@ -331,6 +390,7 @@ bak_ibdata2 bak_undo001 bak_undo002 bak_undo003 +cache ib_buffer_pool ib_logfile0 ib_logfile1 diff --git a/mysql-test/suite/innodb/r/partition-upgrade.result b/mysql-test/suite/innodb/r/partition-upgrade.result index b0f15d757..8a551e087 100644 --- a/mysql-test/suite/innodb/r/partition-upgrade.result +++ b/mysql-test/suite/innodb/r/partition-upgrade.result @@ -123,6 +123,10 @@ mysql.user OK mtr.global_suppressions OK mtr.test_suppressions OK sys.sys_config OK +sys_stonedb.column_ttl OK +sys_stonedb.columns OK +sys_stonedb.decomposition_dictionary OK +sys_stonedb.logs OK test.t575 OK # Flush the table data files FLUSH TABLE t575 FOR EXPORT; @@ -206,6 +210,10 @@ mysql.user OK mtr.global_suppressions OK mtr.test_suppressions OK sys.sys_config OK +sys_stonedb.column_ttl OK +sys_stonedb.columns OK +sys_stonedb.decomposition_dictionary OK +sys_stonedb.logs OK test.t575 error : Partitioning upgrade required. Please dump/reload to fix it or do: ALTER TABLE `test`.`t575` UPGRADE PARTITIONING warning : The partition engine, used by table 'test.t575', is deprecated and will be removed in a future release. Please use native partitioning instead. diff --git a/mysql-test/t/mysqlpump_basic.test b/mysql-test/t/mysqlpump_basic.test index f85c0ef99..08cabf236 100644 --- a/mysql-test/t/mysqlpump_basic.test +++ b/mysql-test/t/mysqlpump_basic.test @@ -313,7 +313,7 @@ SHOW CREATE VIEW db4_basic.v1; SHOW CREATE VIEW db4_basic.v2; #dump all dbs ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr > $MYSQLTEST_VARDIR/tmp/db1_basic.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_basic.sql DROP DATABASE db1_basic; DROP DATABASE db2_basic; DROP DATABASE db3_basic; @@ -329,7 +329,7 @@ SHOW CREATE VIEW db4_basic.v1; SHOW CREATE VIEW db4_basic.v2; # test with default-parallelism=0 ---exec $MYSQL_PUMP --default-parallelism=0 --exclude-databases=mysql,mtr > $MYSQLTEST_VARDIR/tmp/db1_basic.sql +--exec $MYSQL_PUMP --default-parallelism=0 --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_basic.sql DROP DATABASE db1_basic; DROP DATABASE db2_basic; DROP DATABASE db3_basic; @@ -685,7 +685,7 @@ CREATE DEFINER=VIEWUSER@LOCALHOST SQL SECURITY DEFINER VIEW V_T1_B AS SELECT * F CREATE SQL SECURITY DEFINER VIEW V_T1_A2 AS SELECT * FROM V_T1_A; CREATE SQL SECURITY DEFINER VIEW V_T1_B2 AS SELECT * FROM V_T1_B; ---exec $MYSQL_PUMP --exclude-databases=mtr --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql +--exec $MYSQL_PUMP --exclude-databases=mtr,sys_stonedb,cache --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql DROP DATABASE DB29023216; DROP USER 'VIEWUSER'@'LOCALHOST'; # restore should succeed @@ -702,7 +702,7 @@ SELECT * FROM V_T1_B2; CREATE DEFINER=VIEWUSER@LOCALHOST FUNCTION TESTFUNC() RETURNS BOOL RETURN TRUE; CREATE VIEW V_T1_C AS SELECT DB29023216.TESTFUNC(); ---exec $MYSQL_PUMP --exclude-databases=mtr --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql +--exec $MYSQL_PUMP --exclude-databases=mtr,sys_stonedb,cache --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql DROP DATABASE DB29023216; DROP USER 'VIEWUSER'@'LOCALHOST'; # restore should succeed diff --git a/mysql-test/t/mysqlpump_bugs.test b/mysql-test/t/mysqlpump_bugs.test index 852605c89..e8772a007 100644 --- a/mysql-test/t/mysqlpump_bugs.test +++ b/mysql-test/t/mysqlpump_bugs.test @@ -12,7 +12,7 @@ EOF CREATE DATABASE db1; CREATE DATABASE db2; ---exec $MYSQLPUMP --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/bug83144.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot > $MYSQLTEST_VARDIR/tmp/bug83144.dump +--exec $MYSQLPUMP --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/bug83144.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot --exclude-databases=mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/bug83144.dump DROP DATABASE db1; DROP DATABASE db2; diff --git a/mysql-test/t/mysqlpump_extended.test b/mysql-test/t/mysqlpump_extended.test index 7b8c2078d..3dccf0f7d 100644 --- a/mysql-test/t/mysqlpump_extended.test +++ b/mysql-test/t/mysqlpump_extended.test @@ -20,7 +20,7 @@ CREATE TABLE t1 (a INT); CREATE TABLE t2 (a INT, b VARCHAR(10), primary key(a)); --echo # test exclude-databases ---exec $MYSQL_PUMP --add-drop-table --exclude-databases=db1_extended,mysql,mtr > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --add-drop-table --exclude-databases=db1_extended,mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP DATABASE db2_extended; DROP DATABASE db1_extended; --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql @@ -208,7 +208,7 @@ USE db4_extended; CREATE TABLE t1 (a INT); CREATE TABLE t2 (a INT, b VARCHAR(10), primary key(a)); ---exec $MYSQL_PUMP --parallel-schemas=db2_extended,db4_extended --exclude-databases=db1_extended,db3_extended,mysql,mtr > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --parallel-schemas=db2_extended,db4_extended --exclude-databases=db1_extended,db3_extended,mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP DATABASE db1_extended; DROP DATABASE db2_extended; @@ -250,7 +250,7 @@ DROP DATABASE db1_extended; CREATE USER u1@localhost IDENTIFIED BY 'abc'; CREATE USER u2; ---exec $MYSQL_PUMP --users --exclude-users=root,mysql.sys,mysql.session --exclude-databases=mysql,mtr > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --users --exclude-users=root,mysql.sys,mysql.session --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP USER u1@localhost,u2; --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.sql @@ -268,7 +268,7 @@ CREATE USER u2; CREATE USER u3@120.0.0.1; GRANT SELECT ON mysql.user to u3@120.0.0.1; ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr --include-users=u2,u1@120.0.0.1 > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --include-users=u2,u1@120.0.0.1 > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP USER u1@localhost,u3@120.0.0.1,u1@120.0.0.1,u2; --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.sql @@ -287,7 +287,7 @@ CREATE USER u2; CREATE USER u3@120.0.0.1; GRANT SELECT ON mysql.user to u3@120.0.0.1; ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr --exclude-users=u2,u1@120.0.0.1,root,mysql.sys,mysql.session > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --exclude-users=u2,u1@120.0.0.1,root,mysql.sys,mysql.session > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP USER u1@localhost,u3@120.0.0.1,u1@120.0.0.1,u2; --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.sql @@ -299,7 +299,7 @@ DROP USER u1@localhost,u3@120.0.0.1; --echo # test add-drop-user CREATE USER u1@localhost IDENTIFIED BY 'abc'; ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr --exclude-users=root,mysql.sys,mysql.session --add-drop-user > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --exclude-users=root,mysql.sys,mysql.session --add-drop-user > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP USER u1@localhost; # if restore reports error it means db1_extended.sql has DROP USER stmt --error 1 @@ -322,7 +322,7 @@ CREATE DEFINER = u1@localhost VIEW v2 AS SELECT t1.a as X, t2.* FROM t1,t2 ORDER CREATE DEFINER = u1@localhost VIEW definer_name_view AS SELECT * FROM t1 union SELECT a FROM t2; #test without skip-definer ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP DATABASE db1_extended; # now restore and check for view definitions @@ -334,7 +334,7 @@ SHOW CREATE VIEW db1_extended.v2; SHOW CREATE VIEW db1_extended.definer_name_view; #test with skip-definer ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP DATABASE db1_extended; # now restore and check for view definitions @@ -388,7 +388,7 @@ CREATE DEFINER = u1@localhost PROCEDURE p2(x int) DELIMITER ;| #test without skip-definer ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP DATABASE db1_extended; # now restore and check for view definitions @@ -401,7 +401,7 @@ SHOW CREATE PROCEDURE db1_extended.p1; SHOW CREATE PROCEDURE db1_extended.p2; #test with skip-definer ---exec $MYSQL_PUMP --exclude-databases=mysql,mtr --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql +--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql DROP DATABASE db1_extended; # now restore and check for view definitions diff --git a/mysql-test/suite/innodb/t/innodb-alter.test b/mysql-test/test/innodb/character_set/innodb-alter.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-alter.test rename to mysql-test/test/innodb/character_set/innodb-alter.test diff --git a/mysql-test/suite/innodb/t/innodb-wl5980-alter.test b/mysql-test/test/innodb/character_set/innodb-wl5980-alter.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-wl5980-alter.test rename to mysql-test/test/innodb/character_set/innodb-wl5980-alter.test diff --git a/mysql-test/suite/innodb/t/import_compress_encrypt.test b/mysql-test/test/innodb/import_compress_encrypt.test similarity index 100% rename from mysql-test/suite/innodb/t/import_compress_encrypt.test rename to mysql-test/test/innodb/import_compress_encrypt.test diff --git a/mysql-test/suite/innodb/t/innodb_pagesize_max_recordsize.test b/mysql-test/test/innodb/innodb_pagesize_max_recordsize.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_pagesize_max_recordsize.test rename to mysql-test/test/innodb/innodb_pagesize_max_recordsize.test diff --git a/mysql-test/suite/innodb/t/mysqldump_max_recordsize.test b/mysql-test/test/innodb/mysqldump_max_recordsize.test similarity index 100% rename from mysql-test/suite/innodb/t/mysqldump_max_recordsize.test rename to mysql-test/test/innodb/mysqldump_max_recordsize.test diff --git a/mysql-test/suite/innodb/t/optimizer_temporary_table.test b/mysql-test/test/innodb/optimizer_temporary_table.test similarity index 100% rename from mysql-test/suite/innodb/t/optimizer_temporary_table.test rename to mysql-test/test/innodb/optimizer_temporary_table.test diff --git a/mysql-test/t/create.test b/mysql-test/test/main/character_set/create.test similarity index 100% rename from mysql-test/t/create.test rename to mysql-test/test/main/character_set/create.test diff --git a/mysql-test/character_set/ctype_latin1.test b/mysql-test/test/main/character_set/ctype_latin1.test similarity index 100% rename from mysql-test/character_set/ctype_latin1.test rename to mysql-test/test/main/character_set/ctype_latin1.test diff --git a/mysql-test/character_set/ctype_recoding.test b/mysql-test/test/main/character_set/ctype_recoding.test similarity index 100% rename from mysql-test/character_set/ctype_recoding.test rename to mysql-test/test/main/character_set/ctype_recoding.test diff --git a/mysql-test/character_set/ddl_i18n_koi8r.test b/mysql-test/test/main/character_set/ddl_i18n_koi8r.test similarity index 100% rename from mysql-test/character_set/ddl_i18n_koi8r.test rename to mysql-test/test/main/character_set/ddl_i18n_koi8r.test diff --git a/mysql-test/character_set/ddl_i18n_utf8.test b/mysql-test/test/main/character_set/ddl_i18n_utf8.test similarity index 100% rename from mysql-test/character_set/ddl_i18n_utf8.test rename to mysql-test/test/main/character_set/ddl_i18n_utf8.test diff --git a/mysql-test/t/events_1.test b/mysql-test/test/main/character_set/events_1.test similarity index 100% rename from mysql-test/t/events_1.test rename to mysql-test/test/main/character_set/events_1.test diff --git a/mysql-test/character_set/events_2.test b/mysql-test/test/main/character_set/events_2.test similarity index 100% rename from mysql-test/character_set/events_2.test rename to mysql-test/test/main/character_set/events_2.test diff --git a/mysql-test/character_set/events_bugs.test b/mysql-test/test/main/character_set/events_bugs.test similarity index 100% rename from mysql-test/character_set/events_bugs.test rename to mysql-test/test/main/character_set/events_bugs.test diff --git a/mysql-test/character_set/explain.test b/mysql-test/test/main/character_set/explain.test similarity index 100% rename from mysql-test/character_set/explain.test rename to mysql-test/test/main/character_set/explain.test diff --git a/mysql-test/character_set/grant.test b/mysql-test/test/main/character_set/grant.test similarity index 100% rename from mysql-test/character_set/grant.test rename to mysql-test/test/main/character_set/grant.test diff --git a/mysql-test/t/information_schema.test b/mysql-test/test/main/character_set/information_schema.test similarity index 100% rename from mysql-test/t/information_schema.test rename to mysql-test/test/main/character_set/information_schema.test diff --git a/mysql-test/character_set/lowercase_table.test b/mysql-test/test/main/character_set/lowercase_table.test similarity index 100% rename from mysql-test/character_set/lowercase_table.test rename to mysql-test/test/main/character_set/lowercase_table.test diff --git a/mysql-test/t/mysqldump.test b/mysql-test/test/main/character_set/mysqldump.test similarity index 100% rename from mysql-test/t/mysqldump.test rename to mysql-test/test/main/character_set/mysqldump.test diff --git a/mysql-test/character_set/mysqlpump_charset.test b/mysql-test/test/main/character_set/mysqlpump_charset.test similarity index 100% rename from mysql-test/character_set/mysqlpump_charset.test rename to mysql-test/test/main/character_set/mysqlpump_charset.test diff --git a/mysql-test/character_set/opt_hints.test b/mysql-test/test/main/character_set/opt_hints.test similarity index 100% rename from mysql-test/character_set/opt_hints.test rename to mysql-test/test/main/character_set/opt_hints.test diff --git a/mysql-test/character_set/partition_charset.test b/mysql-test/test/main/character_set/partition_charset.test similarity index 100% rename from mysql-test/character_set/partition_charset.test rename to mysql-test/test/main/character_set/partition_charset.test diff --git a/mysql-test/character_set/plugin_auth.test b/mysql-test/test/main/character_set/plugin_auth.test similarity index 100% rename from mysql-test/character_set/plugin_auth.test rename to mysql-test/test/main/character_set/plugin_auth.test diff --git a/mysql-test/character_set/show_check.test b/mysql-test/test/main/character_set/show_check.test similarity index 100% rename from mysql-test/character_set/show_check.test rename to mysql-test/test/main/character_set/show_check.test diff --git a/mysql-test/character_set/sp.test b/mysql-test/test/main/character_set/sp.test similarity index 100% rename from mysql-test/character_set/sp.test rename to mysql-test/test/main/character_set/sp.test diff --git a/mysql-test/t/gis-precise.test b/mysql-test/test/main/gis-precise.test similarity index 100% rename from mysql-test/t/gis-precise.test rename to mysql-test/test/main/gis-precise.test diff --git a/mysql-test/t/gis.test b/mysql-test/test/main/gis.test similarity index 100% rename from mysql-test/t/gis.test rename to mysql-test/test/main/gis.test diff --git a/mysql-test/t/index_merge_myisam.test b/mysql-test/test/main/myisam/index_merge_myisam.test similarity index 100% rename from mysql-test/t/index_merge_myisam.test rename to mysql-test/test/main/myisam/index_merge_myisam.test diff --git a/mysql-test/t/myisam.test b/mysql-test/test/main/myisam/myisam.test similarity index 100% rename from mysql-test/t/myisam.test rename to mysql-test/test/main/myisam/myisam.test diff --git a/mysql-test/t/myisam_explain_json_non_select_all.test b/mysql-test/test/main/myisam/myisam_explain_json_non_select_all.test similarity index 100% rename from mysql-test/t/myisam_explain_json_non_select_all.test rename to mysql-test/test/main/myisam/myisam_explain_json_non_select_all.test diff --git a/mysql-test/t/myisam_explain_json_non_select_none.test b/mysql-test/test/main/myisam/myisam_explain_json_non_select_none.test similarity index 100% rename from mysql-test/t/myisam_explain_json_non_select_none.test rename to mysql-test/test/main/myisam/myisam_explain_json_non_select_none.test diff --git a/mysql-test/t/myisampack.test b/mysql-test/test/main/myisam/myisampack.test similarity index 100% rename from mysql-test/t/myisampack.test rename to mysql-test/test/main/myisam/myisampack.test diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/test/main/mysql_client_test-master.opt similarity index 100% rename from mysql-test/t/mysql_client_test-master.opt rename to mysql-test/test/main/mysql_client_test-master.opt diff --git a/mysql-test/t/mysql_client_test.test b/mysql-test/test/main/mysql_client_test.test similarity index 100% rename from mysql-test/t/mysql_client_test.test rename to mysql-test/test/main/mysql_client_test.test diff --git a/mysql-test/t/mysql_plugin-master.opt b/mysql-test/test/main/mysql_plugin-master.opt similarity index 100% rename from mysql-test/t/mysql_plugin-master.opt rename to mysql-test/test/main/mysql_plugin-master.opt diff --git a/mysql-test/t/mysql_plugin.test b/mysql-test/test/main/mysql_plugin.test similarity index 100% rename from mysql-test/t/mysql_plugin.test rename to mysql-test/test/main/mysql_plugin.test diff --git a/mysql-test/t/mysqld_safe.sh b/mysql-test/test/main/mysqld_safe.sh similarity index 100% rename from mysql-test/t/mysqld_safe.sh rename to mysql-test/test/main/mysqld_safe.sh diff --git a/mysql-test/t/mysqld_safe.test b/mysql-test/test/main/mysqld_safe.test similarity index 100% rename from mysql-test/t/mysqld_safe.test rename to mysql-test/test/main/mysqld_safe.test diff --git a/mysql-test/t/derived.test b/mysql-test/test/main/optimizer_switch/derived.test similarity index 100% rename from mysql-test/t/derived.test rename to mysql-test/test/main/optimizer_switch/derived.test diff --git a/mysql-test/t/heap.test b/mysql-test/test/main/optimizer_switch/heap.test similarity index 100% rename from mysql-test/t/heap.test rename to mysql-test/test/main/optimizer_switch/heap.test diff --git a/mysql-test/t/opt_costmodel_flush.test b/mysql-test/test/main/optimizer_switch/opt_costmodel_flush.test similarity index 100% rename from mysql-test/t/opt_costmodel_flush.test rename to mysql-test/test/main/optimizer_switch/opt_costmodel_flush.test diff --git a/mysql-test/t/optimizer_switch.test b/mysql-test/test/main/optimizer_switch/optimizer_switch.test similarity index 100% rename from mysql-test/t/optimizer_switch.test rename to mysql-test/test/main/optimizer_switch/optimizer_switch.test diff --git a/mysql-test/t/subquery_bugs.test b/mysql-test/test/main/optimizer_switch/subquery_bugs.test similarity index 100% rename from mysql-test/t/subquery_bugs.test rename to mysql-test/test/main/optimizer_switch/subquery_bugs.test diff --git a/mysql-test/t/subquery_sj_dupsweed-master.opt b/mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed-master.opt similarity index 100% rename from mysql-test/t/subquery_sj_dupsweed-master.opt rename to mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed-master.opt diff --git a/mysql-test/t/subquery_sj_dupsweed.test b/mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed.test similarity index 100% rename from mysql-test/t/subquery_sj_dupsweed.test rename to mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed.test diff --git a/mysql-test/t/subquery_sj_dupsweed_bka.test b/mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed_bka.test similarity index 100% rename from mysql-test/t/subquery_sj_dupsweed_bka.test rename to mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed_bka.test diff --git a/mysql-test/t/subquery_sj_dupsweed_bka_nixbnl-master.opt b/mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed_bka_nixbnl-master.opt similarity index 100% rename from mysql-test/t/subquery_sj_dupsweed_bka_nixbnl-master.opt rename to mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed_bka_nixbnl-master.opt diff --git a/mysql-test/t/subquery_sj_dupsweed_bka_nixbnl.test b/mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed_bka_nixbnl.test similarity index 100% rename from mysql-test/t/subquery_sj_dupsweed_bka_nixbnl.test rename to mysql-test/test/main/optimizer_switch/subquery_sj_dupsweed_bka_nixbnl.test diff --git a/mysql-test/t/subselect_innodb.test b/mysql-test/test/main/optimizer_switch/subselect_innodb.test similarity index 100% rename from mysql-test/t/subselect_innodb.test rename to mysql-test/test/main/optimizer_switch/subselect_innodb.test diff --git a/mysql-test/t/view.test b/mysql-test/test/main/optimizer_switch/view.test similarity index 100% rename from mysql-test/t/view.test rename to mysql-test/test/main/optimizer_switch/view.test diff --git a/mysql-test/t/type_float.test b/mysql-test/test/main/type_float.test similarity index 100% rename from mysql-test/t/type_float.test rename to mysql-test/test/main/type_float.test diff --git a/mysql-test/t/type_string-master.opt b/mysql-test/test/main/type_string-master.opt similarity index 100% rename from mysql-test/t/type_string-master.opt rename to mysql-test/test/main/type_string-master.opt diff --git a/mysql-test/t/type_string.test b/mysql-test/test/main/type_string.test similarity index 100% rename from mysql-test/t/type_string.test rename to mysql-test/test/main/type_string.test -- GitLab