From 4670a23957304fbb28f635f3c064b03b452424fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Tue, 3 Dec 2019 14:37:45 +0200 Subject: [PATCH] Re-record sql_sequence.rebuild with sorted_result --- mysql-test/suite/sql_sequence/rebuild.result | 220 +++++++++---------- mysql-test/suite/sql_sequence/rebuild.test | 2 + 2 files changed, 112 insertions(+), 110 deletions(-) diff --git a/mysql-test/suite/sql_sequence/rebuild.result b/mysql-test/suite/sql_sequence/rebuild.result index f18281a75d2..c8dc47ad8fa 100644 --- a/mysql-test/suite/sql_sequence/rebuild.result +++ b/mysql-test/suite/sql_sequence/rebuild.result @@ -12,98 +12,11 @@ a 1 select * from t2; b -t2 -t1 -s1 -users -threads -table_lock_waits_summary_by_table -table_io_waits_summary_by_table -table_io_waits_summary_by_index_usage -socket_summary_by_instance -socket_summary_by_event_name -socket_instances -setup_timers -setup_objects -setup_instruments -setup_consumers -setup_actors -session_connect_attrs -session_account_connect_attrs -rwlock_instances -performance_timers -objects_summary_global_by_type -mutex_instances -hosts -host_cache -file_summary_by_instance -file_summary_by_event_name -file_instances -events_waits_summary_global_by_event_name -events_waits_summary_by_user_by_event_name -events_waits_summary_by_thread_by_event_name -events_waits_summary_by_instance -events_waits_summary_by_host_by_event_name -events_waits_summary_by_account_by_event_name -events_waits_history_long -events_waits_history -events_waits_current -events_statements_summary_global_by_event_name -events_statements_summary_by_user_by_event_name -events_statements_summary_by_thread_by_event_name -events_statements_summary_by_host_by_event_name -events_statements_summary_by_digest -events_statements_summary_by_account_by_event_name -events_statements_history_long -events_statements_history -events_statements_current -events_stages_summary_global_by_event_name -events_stages_summary_by_user_by_event_name -events_stages_summary_by_thread_by_event_name -events_stages_summary_by_host_by_event_name -events_stages_summary_by_account_by_event_name -events_stages_history_long -events_stages_history -events_stages_current -cond_instances -accounts -user -transaction_registry -time_zone_transition_type -time_zone_transition -time_zone_name -time_zone_leap_second -time_zone -tables_priv -table_stats -slow_log -servers -roles_mapping -proxies_priv -procs_priv -proc -plugin -innodb_table_stats -innodb_index_stats -index_stats -host -help_topic -help_relation -help_keyword -help_category -gtid_slave_pos -general_log -func -event -db -columns_priv -column_stats -test_suppressions -global_suppressions ALL_PLUGINS APPLICABLE_ROLES CHARACTER_SETS CHECK_CONSTRAINTS +CLIENT_STATISTICS COLLATIONS COLLATION_CHARACTER_SET_APPLICABILITY COLUMNS @@ -112,8 +25,26 @@ ENABLED_ROLES ENGINES EVENTS FILES +GEOMETRY_COLUMNS GLOBAL_STATUS GLOBAL_VARIABLES +INDEX_STATISTICS +INNODB_BUFFER_PAGE +INNODB_BUFFER_PAGE_LRU +INNODB_BUFFER_POOL_STATS +INNODB_CMPMEM +INNODB_CMP_PER_INDEX +INNODB_LOCKS +INNODB_LOCK_WAITS +INNODB_METRICS +INNODB_SYS_COLUMNS +INNODB_SYS_FIELDS +INNODB_SYS_FOREIGN +INNODB_SYS_FOREIGN_COLS +INNODB_SYS_INDEXES +INNODB_SYS_TABLES +INNODB_SYS_VIRTUAL +INNODB_TRX KEY_CACHES KEY_COLUMN_USAGE PARAMETERS @@ -127,35 +58,104 @@ SCHEMATA SCHEMA_PRIVILEGES SESSION_STATUS SESSION_VARIABLES +SPATIAL_REF_SYS STATISTICS SYSTEM_VARIABLES TABLES TABLESPACES TABLE_CONSTRAINTS TABLE_PRIVILEGES +TABLE_STATISTICS TRIGGERS USER_PRIVILEGES -VIEWS -GEOMETRY_COLUMNS -SPATIAL_REF_SYS -CLIENT_STATISTICS -INDEX_STATISTICS USER_STATISTICS -INNODB_LOCKS -INNODB_CMPMEM -INNODB_CMP_PER_INDEX -INNODB_LOCK_WAITS -TABLE_STATISTICS -INNODB_BUFFER_PAGE_LRU -INNODB_SYS_FIELDS -INNODB_SYS_COLUMNS -INNODB_SYS_FOREIGN_COLS -INNODB_BUFFER_POOL_STATS -INNODB_TRX -INNODB_SYS_FOREIGN -INNODB_SYS_TABLES -INNODB_BUFFER_PAGE -INNODB_METRICS -INNODB_SYS_INDEXES -INNODB_SYS_VIRTUAL +VIEWS +accounts +column_stats +columns_priv +cond_instances +db +event +events_stages_current +events_stages_history +events_stages_history_long +events_stages_summary_by_account_by_event_name +events_stages_summary_by_host_by_event_name +events_stages_summary_by_thread_by_event_name +events_stages_summary_by_user_by_event_name +events_stages_summary_global_by_event_name +events_statements_current +events_statements_history +events_statements_history_long +events_statements_summary_by_account_by_event_name +events_statements_summary_by_digest +events_statements_summary_by_host_by_event_name +events_statements_summary_by_thread_by_event_name +events_statements_summary_by_user_by_event_name +events_statements_summary_global_by_event_name +events_waits_current +events_waits_history +events_waits_history_long +events_waits_summary_by_account_by_event_name +events_waits_summary_by_host_by_event_name +events_waits_summary_by_instance +events_waits_summary_by_thread_by_event_name +events_waits_summary_by_user_by_event_name +events_waits_summary_global_by_event_name +file_instances +file_summary_by_event_name +file_summary_by_instance +func +general_log +global_suppressions +gtid_slave_pos +help_category +help_keyword +help_relation +help_topic +host +host_cache +hosts +index_stats +innodb_index_stats +innodb_table_stats +mutex_instances +objects_summary_global_by_type +performance_timers +plugin +proc +procs_priv +proxies_priv +roles_mapping +rwlock_instances +s1 +servers +session_account_connect_attrs +session_connect_attrs +setup_actors +setup_consumers +setup_instruments +setup_objects +setup_timers +slow_log +socket_instances +socket_summary_by_event_name +socket_summary_by_instance +t1 +t2 +table_io_waits_summary_by_index_usage +table_io_waits_summary_by_table +table_lock_waits_summary_by_table +table_stats +tables_priv +test_suppressions +threads +time_zone +time_zone_leap_second +time_zone_name +time_zone_transition +time_zone_transition_type +transaction_registry +user +users DROP TABLE t1, t2, s1; diff --git a/mysql-test/suite/sql_sequence/rebuild.test b/mysql-test/suite/sql_sequence/rebuild.test index 66b99ba0e94..7c00e0be7cc 100644 --- a/mysql-test/suite/sql_sequence/rebuild.test +++ b/mysql-test/suite/sql_sequence/rebuild.test @@ -10,7 +10,9 @@ CREATE TABLE t1 (a INT) ENGINE=MyISAM; CREATE TABLE t2 (b VARCHAR(64)) ENGINE=MyISAM; CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS; INSERT INTO t1 VALUES (1); +--sorted_result select * from t1; +--sorted_result select * from t2; # Cleanup