From 775cba4d0f044474e22ac0e481adc9ffd16dd31e Mon Sep 17 00:00:00 2001 From: Monty Date: Sun, 31 Dec 2023 16:23:04 +0200 Subject: [PATCH] MDEV-33145 Add FLUSH GLOBAL STATUS - FLUSH GLOBAL STATUS now resets most global_status_vars. At this stage, this is mainly to be used for testing. - FLUSH SESSION STATUS added as an alias for FLUSH STATUS. - FLUSH STATUS does not require any privilege (before required RELOAD). - FLUSH GLOBAL STATUS requires RELOAD privilege. - All global status reset moved to FLUSH GLOBAL STATUS. - Replication semisync status variables are now reset by FLUSH GLOBAL STATUS. - In test cases, the only changes are: - Replace FLUSH STATUS with FLUSH GLOBAL STATUS - Replace FLUSH STATUS with FLUSH STATUS; FLUSH GLOBAL STATUS. This was only done in a few tests where the test was using SHOW STATUS for both local and global variables. - Uptime_since_flush_status is now always provided, independent if ENABLED_PROFILING is enabled when compiling MariaDB. - @@global.Uptime_since_flush_status is reset on FLUSH GLOBAL STATUS and @@session.Uptime_since_flush_status is reset on FLUSH SESSION STATUS. - When connected, @@session.Uptime_since_flush_status is set to 0. --- client/mysqladmin.cc | 7 +- include/mysql_com.h | 8 +- mysql-test/include/check_key_reads.inc | 2 +- mysql-test/include/query_cache.inc | 4 +- mysql-test/include/query_cache_partitions.inc | 6 +- .../include/query_cache_sql_prepare.inc | 4 +- mysql-test/main/cache_innodb.result | 4 +- mysql-test/main/connect.result | 4 +- mysql-test/main/connect.test | 4 +- mysql-test/main/features.result | 2 +- mysql-test/main/features.test | 2 +- mysql-test/main/flush_notembedded.result | 14 ++++ mysql-test/main/flush_notembedded.test | 18 +++++ mysql-test/main/key_cache.result | 4 +- mysql-test/main/key_cache.test | 4 +- mysql-test/main/mysqladmin.result | 29 ++++++++ mysql-test/main/mysqladmin.test | 28 +++++++ mysql-test/main/partition_cache.result | 4 +- mysql-test/main/partition_cache_innodb.result | 6 +- mysql-test/main/partition_cache_myisam.result | 6 +- mysql-test/main/partition_key_cache.result | 8 +- mysql-test/main/partition_key_cache.test | 10 +-- mysql-test/main/preload.result | 12 +-- mysql-test/main/preload.test | 12 +-- mysql-test/main/query_cache.result | 36 ++++----- mysql-test/main/query_cache.test | 36 ++++----- .../main/query_cache_notembedded.result | 10 +-- mysql-test/main/query_cache_notembedded.test | 10 +-- mysql-test/main/query_cache_ps_no_prot.result | 4 +- mysql-test/main/query_cache_ps_ps_prot.result | 4 +- mysql-test/main/query_cache_with_views.result | 6 +- mysql-test/main/query_cache_with_views.test | 6 +- mysql-test/main/status.result | 26 ++++++- mysql-test/main/status.test | 50 +++++++++++-- mysql-test/main/subselect.result | 2 + mysql-test/main/subselect.test | 2 + mysql-test/main/subselect_cache.result | 37 ++++++++++ mysql-test/main/subselect_cache.test | 74 +++++++++---------- .../main/subselect_no_exists_to_in.result | 2 + mysql-test/main/subselect_no_mat.result | 2 + mysql-test/main/subselect_no_opts.result | 2 + mysql-test/main/subselect_no_scache.result | 2 + mysql-test/main/subselect_no_semijoin.result | 2 + mysql-test/main/view.result | 4 + mysql-test/main/view.test | 8 +- mysql-test/suite/binlog/include/binlog.test | 2 +- .../binlog/include/binlog_cache_stat.test | 4 +- .../suite/binlog/r/binlog_gtid_index.result | 2 +- .../suite/binlog/r/binlog_innodb.result | 2 +- .../binlog/r/binlog_mixed_cache_stat.result | 4 +- .../suite/binlog/r/binlog_row_binlog.result | 4 +- .../binlog/r/binlog_row_cache_stat.result | 4 +- .../suite/binlog/r/binlog_stm_binlog.result | 4 +- .../binlog/r/binlog_stm_cache_stat.result | 4 +- mysql-test/suite/binlog/r/mysqladmin.result | 4 +- .../suite/binlog/t/binlog_gtid_index.test | 2 +- mysql-test/suite/binlog/t/binlog_innodb.test | 2 +- .../binlog_encryption/rpl_semi_sync.result | 2 +- .../suite/galera/r/galera_query_cache.result | 6 +- .../suite/galera/t/galera_query_cache.test | 6 +- .../perfschema/include/connection_setup.inc | 2 +- .../include/event_aggregate_setup.inc | 2 +- .../include/hostcache_set_state.inc | 2 +- .../include/memory_aggregate_setup.inc | 2 +- .../suite/perfschema/include/stage_setup.inc | 2 +- .../include/table_aggregate_setup.inc | 2 +- .../include/table_io_cleanup_helper.inc | 2 +- .../include/table_io_result_helper.inc | 2 +- .../include/table_io_setup_helper.inc | 2 +- .../suite/perfschema/r/csv_table_io.result | 6 +- .../suite/perfschema/r/func_file_io.result | 2 +- .../suite/perfschema/r/func_mutex.result | 2 +- ...hostcache_ipv4_addrinfo_again_allow.result | 2 +- .../hostcache_ipv4_addrinfo_again_deny.result | 2 +- .../hostcache_ipv4_addrinfo_bad_allow.result | 2 +- .../r/hostcache_ipv4_addrinfo_bad_deny.result | 2 +- .../hostcache_ipv4_addrinfo_good_allow.result | 2 +- .../hostcache_ipv4_addrinfo_good_deny.result | 2 +- ...ostcache_ipv4_addrinfo_noname_allow.result | 2 +- ...hostcache_ipv4_addrinfo_noname_deny.result | 2 +- .../r/hostcache_ipv4_auth_ed25519.result | 2 +- .../r/hostcache_ipv4_auth_plugin.result | 2 +- .../r/hostcache_ipv4_blocked.result | 2 +- .../perfschema/r/hostcache_ipv4_format.result | 2 +- .../r/hostcache_ipv4_max_con.result | 2 +- ...hostcache_ipv4_nameinfo_again_allow.result | 2 +- .../hostcache_ipv4_nameinfo_again_deny.result | 2 +- ...ostcache_ipv4_nameinfo_noname_allow.result | 2 +- ...hostcache_ipv4_nameinfo_noname_deny.result | 2 +- .../perfschema/r/hostcache_ipv4_passwd.result | 2 +- .../perfschema/r/hostcache_ipv4_ssl.result | 2 +- ...hostcache_ipv6_addrinfo_again_allow.result | 2 +- .../hostcache_ipv6_addrinfo_again_deny.result | 2 +- .../hostcache_ipv6_addrinfo_bad_allow.result | 2 +- .../r/hostcache_ipv6_addrinfo_bad_deny.result | 2 +- .../hostcache_ipv6_addrinfo_good_allow.result | 2 +- .../hostcache_ipv6_addrinfo_good_deny.result | 2 +- ...ostcache_ipv6_addrinfo_noname_allow.result | 2 +- ...hostcache_ipv6_addrinfo_noname_deny.result | 2 +- .../r/hostcache_ipv6_auth_plugin.result | 2 +- .../r/hostcache_ipv6_blocked.result | 2 +- .../r/hostcache_ipv6_max_con.result | 2 +- ...hostcache_ipv6_nameinfo_again_allow.result | 2 +- .../hostcache_ipv6_nameinfo_again_deny.result | 2 +- ...ostcache_ipv6_nameinfo_noname_allow.result | 2 +- ...hostcache_ipv6_nameinfo_noname_deny.result | 2 +- .../perfschema/r/hostcache_ipv6_passwd.result | 2 +- .../perfschema/r/hostcache_ipv6_ssl.result | 2 +- .../perfschema/r/hostcache_peer_addr.result | 4 +- .../perfschema/r/indexed_table_io.result | 4 +- .../suite/perfschema/r/innodb_table_io.result | 6 +- mysql-test/suite/perfschema/r/mdl_func.result | 2 +- .../suite/perfschema/r/memory_table_io.result | 6 +- .../suite/perfschema/r/merge_table_io.result | 6 +- .../perfschema/r/misc_global_status.result | 2 +- .../suite/perfschema/r/multi_table_io.result | 6 +- .../suite/perfschema/r/myisam_file_io.result | 2 +- .../suite/perfschema/r/myisam_table_io.result | 6 +- .../suite/perfschema/r/ortho_iter.result | 2 +- .../suite/perfschema/r/part_table_io.result | 6 +- .../perfschema/r/privilege_table_io.result | 6 +- .../suite/perfschema/r/query_cache.result | 4 +- .../perfschema/r/rollback_table_io.result | 6 +- .../suite/perfschema/r/show_aggregate.result | 6 +- .../r/start_server_low_index.result | 4 +- .../r/start_server_low_table_lock.result | 2 +- .../perfschema/r/start_server_no_index.result | 2 +- .../perfschema/r/start_server_no_mdl.result | 2 +- ..._server_no_prepared_stmts_instances.result | 2 +- .../r/start_server_no_table_lock.result | 2 +- .../suite/perfschema/r/temp_table_io.result | 6 +- .../suite/perfschema/r/thread_cache.result | 2 +- .../perfschema/r/trigger_table_io.result | 6 +- .../suite/perfschema/r/view_table_io.result | 6 +- .../suite/perfschema/t/func_file_io.test | 2 +- mysql-test/suite/perfschema/t/func_mutex.test | 2 +- .../perfschema/t/hostcache_peer_addr.test | 2 +- mysql-test/suite/perfschema/t/mdl_func.test | 2 +- .../perfschema/t/misc_global_status.test | 2 +- .../suite/perfschema/t/myisam_file_io.test | 2 +- mysql-test/suite/perfschema/t/nesting.test | 2 +- mysql-test/suite/perfschema/t/ortho_iter.test | 2 +- .../suite/perfschema/t/query_cache.test | 4 +- .../suite/perfschema/t/show_aggregate.test | 6 +- .../suite/perfschema/t/show_coverage.test | 4 +- mysql-test/suite/perfschema/t/show_misc.test | 1 + .../perfschema/t/start_server_low_index.test | 4 +- .../t/start_server_low_table_lock.test | 3 +- .../perfschema/t/start_server_no_index.test | 4 +- .../perfschema/t/start_server_no_mdl.test | 2 +- ...rt_server_no_prepared_stmts_instances.test | 2 +- .../t/start_server_no_table_lock.test | 2 +- .../suite/perfschema/t/thread_cache.test | 2 +- .../suite/plugins/r/show_all_plugins.result | 2 +- .../suite/plugins/t/show_all_plugins.test | 2 +- ...rpl_binlog_cache_disk_full_loaddata.result | 2 +- .../r/rpl_binlog_cache_disk_full_row.result | 2 +- .../suite/rpl/r/rpl_checksum_cache.result | 8 +- mysql-test/suite/rpl/r/rpl_semi_sync.result | 2 +- .../rpl/r/rpl_semi_sync_after_sync.result | 2 +- .../rpl/r/rpl_semi_sync_after_sync_row.result | 2 +- .../rpl_binlog_cache_disk_full_loaddata.test | 2 +- .../rpl/t/rpl_binlog_cache_disk_full_row.test | 2 +- .../suite/rpl/t/rpl_checksum_cache.test | 8 +- mysql-test/suite/rpl/t/rpl_semi_sync.test | 2 +- .../suite/sql_sequence/replication.result | 2 +- .../suite/sql_sequence/replication.test | 2 +- .../sys_vars/r/delay_key_write_func.result | 6 +- .../sys_vars/r/query_cache_limit_func.result | 8 +- .../sys_vars/t/delay_key_write_func.test | 6 +- .../sys_vars/t/query_cache_limit_func.test | 8 +- mysys/my_getsystime.c | 2 +- sql/mysqld.cc | 67 ++++++++++++----- sql/mysqld.h | 5 +- sql/semisync_master.cc | 16 ++++ sql/semisync_master.h | 1 + sql/sql_class.cc | 2 + sql/sql_class.h | 1 + sql/sql_parse.cc | 9 ++- sql/sql_reload.cc | 6 +- sql/sql_yacc.yy | 6 +- ...count_skip_after_insert_multithread.result | 2 +- ...unt_skip_after_insert_single_thread.result | 2 +- .../r/optimization_count_skip_disabled.result | 2 +- .../optimization_count_skip_index_and.result | 2 +- ...timization_count_skip_index_between.result | 2 +- ...optimization_count_skip_index_equal.result | 2 +- ...ex_full_text_search_in_boolean_mode.result | 2 +- ...ext_search_in_natural_language_mode.result | 2 +- ...timization_count_skip_index_greater.result | 2 +- ...tion_count_skip_index_greater_equal.result | 2 +- .../optimization_count_skip_index_less.result | 2 +- ...ization_count_skip_index_less_equal.result | 2 +- ...mization_count_skip_index_not_equal.result | 2 +- ...tion_count_skip_multiple_conditions.result | 2 +- ...tion_count_skip_primary_key_between.result | 2 +- ...zation_count_skip_primary_key_equal.result | 2 +- ...tion_count_skip_primary_key_greater.result | 2 +- ...ount_skip_primary_key_greater_equal.result | 2 +- ...ization_count_skip_primary_key_less.result | 2 +- ...n_count_skip_primary_key_less_equal.result | 2 +- ...on_count_skip_primary_key_not_equal.result | 2 +- ..._order_limit_not_optimized_disabled.result | 2 +- ...t_optimized_multiple_match_againsts.result | 2 +- ..._order_limit_not_optimized_no_limit.result | 2 +- ...ization_order_limit_optimized_cp932.result | 2 +- ...er_limit_optimized_datetime_between.result | 2 +- ...mit_optimized_datetime_between_over.result | 2 +- ...rder_limit_optimized_datetime_equal.result | 2 +- ...mit_optimized_datetime_greater_than.result | 2 +- ...ized_datetime_greater_than_or_equal.result | 2 +- ..._limit_optimized_datetime_less_than.result | 2 +- ...timized_datetime_less_than_or_equal.result | 2 +- ...timized_duplicated_order_by_columns.result | 2 +- ...ion_order_limit_optimized_enum_name.result | 2 +- ...on_order_limit_optimized_enum_value.result | 2 +- ...er_limit_optimized_have_primary_key.result | 2 +- ...n_order_limit_optimized_int_between.result | 2 +- ...er_limit_optimized_int_between_over.result | 2 +- ...ion_order_limit_optimized_int_equal.result | 2 +- ...er_limit_optimized_int_greater_than.result | 2 +- ...optimized_int_greater_than_or_equal.result | 2 +- ...order_limit_optimized_int_less_than.result | 2 +- ...it_optimized_int_less_than_or_equal.result | 2 +- ...rder_limit_optimized_no_primary_key.result | 2 +- ...der_limit_optimized_no_where_clause.result | 2 +- ..._order_limit_optimized_order_by_asc.result | 2 +- ...order_limit_optimized_order_by_desc.result | 2 +- ...n_order_limit_optimized_order_by_id.result | 2 +- ...it_optimized_order_by_match_against.result | 2 +- ...imit_optimized_select_match_against.result | 2 +- ..._order_limit_optimized_time_between.result | 2 +- ...r_limit_optimized_time_between_over.result | 2 +- ...on_order_limit_optimized_time_equal.result | 2 +- ...r_limit_optimized_time_greater_than.result | 2 +- ...ptimized_time_greater_than_or_equal.result | 2 +- ...rder_limit_optimized_time_less_than.result | 2 +- ...t_optimized_time_less_than_or_equal.result | 2 +- ..._optimized_varchar_equal_with_index.result | 2 +- ...timized_varchar_equal_without_index.result | 2 +- ..._order_limit_optimized_year_between.result | 2 +- ...r_limit_optimized_year_between_over.result | 2 +- ...on_order_limit_optimized_year_equal.result | 2 +- ...r_limit_optimized_year_greater_than.result | 2 +- ...ptimized_year_greater_than_or_equal.result | 2 +- ...rder_limit_optimized_year_less_than.result | 2 +- ...t_optimized_year_less_than_or_equal.result | 2 +- ...n_count_skip_after_insert_multithread.test | 2 +- ...count_skip_after_insert_single_thread.test | 2 +- .../t/optimization_count_skip_disabled.test | 2 +- .../t/optimization_count_skip_index_and.test | 2 +- ...optimization_count_skip_index_between.test | 2 +- .../optimization_count_skip_index_equal.test | 2 +- ...ndex_full_text_search_in_boolean_mode.test | 2 +- ..._text_search_in_natural_language_mode.test | 2 +- ...optimization_count_skip_index_greater.test | 2 +- ...zation_count_skip_index_greater_equal.test | 2 +- .../t/optimization_count_skip_index_less.test | 2 +- ...imization_count_skip_index_less_equal.test | 2 +- ...timization_count_skip_index_not_equal.test | 2 +- ...zation_count_skip_multiple_conditions.test | 2 +- ...zation_count_skip_primary_key_between.test | 2 +- ...mization_count_skip_primary_key_equal.test | 2 +- ...zation_count_skip_primary_key_greater.test | 2 +- ..._count_skip_primary_key_greater_equal.test | 2 +- ...imization_count_skip_primary_key_less.test | 2 +- ...ion_count_skip_primary_key_less_equal.test | 2 +- ...tion_count_skip_primary_key_not_equal.test | 2 +- ...on_order_limit_not_optimized_disabled.test | 2 +- ...not_optimized_multiple_match_againsts.test | 2 +- ...on_order_limit_not_optimized_no_limit.test | 2 +- ...imization_order_limit_optimized_cp932.test | 2 +- ...rder_limit_optimized_datetime_between.test | 2 +- ...limit_optimized_datetime_between_over.test | 2 +- ..._order_limit_optimized_datetime_equal.test | 2 +- ...limit_optimized_datetime_greater_than.test | 2 +- ...imized_datetime_greater_than_or_equal.test | 2 +- ...er_limit_optimized_datetime_less_than.test | 2 +- ...optimized_datetime_less_than_or_equal.test | 2 +- ...optimized_duplicated_order_by_columns.test | 2 +- ...ation_order_limit_optimized_enum_name.test | 2 +- ...tion_order_limit_optimized_enum_value.test | 2 +- ...rder_limit_optimized_have_primary_key.test | 2 +- ...ion_order_limit_optimized_int_between.test | 2 +- ...rder_limit_optimized_int_between_over.test | 2 +- ...ation_order_limit_optimized_int_equal.test | 2 +- ...rder_limit_optimized_int_greater_than.test | 2 +- ...t_optimized_int_greater_than_or_equal.test | 2 +- ...n_order_limit_optimized_int_less_than.test | 2 +- ...imit_optimized_int_less_than_or_equal.test | 2 +- ..._order_limit_optimized_no_primary_key.test | 2 +- ...order_limit_optimized_no_where_clause.test | 2 +- ...on_order_limit_optimized_order_by_asc.test | 2 +- ...n_order_limit_optimized_order_by_desc.test | 2 +- ...ion_order_limit_optimized_order_by_id.test | 2 +- ...imit_optimized_order_by_match_against.test | 2 +- ..._limit_optimized_select_match_against.test | 2 +- ...on_order_limit_optimized_time_between.test | 2 +- ...der_limit_optimized_time_between_over.test | 2 +- ...tion_order_limit_optimized_time_equal.test | 2 +- ...der_limit_optimized_time_greater_than.test | 2 +- ..._optimized_time_greater_than_or_equal.test | 2 +- ..._order_limit_optimized_time_less_than.test | 2 +- ...mit_optimized_time_less_than_or_equal.test | 2 +- ...it_optimized_varchar_equal_with_index.test | 2 +- ...optimized_varchar_equal_without_index.test | 2 +- ...on_order_limit_optimized_year_between.test | 2 +- ...der_limit_optimized_year_between_over.test | 2 +- ...tion_order_limit_optimized_year_equal.test | 2 +- ...der_limit_optimized_year_greater_than.test | 2 +- ..._optimized_year_greater_than_or_equal.test | 2 +- ..._order_limit_optimized_year_less_than.test | 2 +- ...mit_optimized_year_less_than_or_equal.test | 2 +- ...imization_order_limit_TODO_SPLIT_ME.result | 2 +- ...timization_order_limit_no_direction.result | 2 +- ...ization_order_limit_no_where_clause.result | 2 +- ...on_order_limit_order_by_primary_key.result | 2 +- ...ptimization_order_limit_TODO_SPLIT_ME.test | 2 +- ...optimization_order_limit_no_direction.test | 2 +- ...imization_order_limit_no_where_clause.test | 2 +- ...tion_order_limit_order_by_primary_key.test | 2 +- .../rocksdb/r/rocksdb_qcache.result | 2 +- .../mysql-test/rocksdb/t/rocksdb_qcache.test | 2 +- .../mysql-test/rocksdb_rpl/r/mdev12179.result | 4 +- .../mysql-test/rocksdb_rpl/t/mdev12179.test | 4 +- 325 files changed, 787 insertions(+), 525 deletions(-) diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 77bcdf506c8..7c515c707e1 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -985,7 +985,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) } case ADMIN_FLUSH_STATUS: { - if (flush(mysql, "status")) + if (flush(mysql, "/*!110500 global */ status")) return -1; break; } @@ -1034,8 +1034,9 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) } case ADMIN_FLUSH_ALL_STATUS: { - if (flush(mysql, "status,table_statistics,index_statistics," - "user_statistics,client_statistics")) + if (flush(mysql, + "/*!110500 global */ status,table_statistics," + "index_statistics, user_statistics,client_statistics")) return -1; break; } diff --git a/include/mysql_com.h b/include/mysql_com.h index 4a939fe2fc7..d36b1a9e1d0 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -194,10 +194,11 @@ enum enum_indicator_type #define REFRESH_LOG (1ULL << 1) /* Start on new log file */ #define REFRESH_TABLES (1ULL << 2) /* close all tables */ #define REFRESH_HOSTS (1ULL << 3) /* Flush host cache */ -#define REFRESH_STATUS (1ULL << 4) /* Flush status variables */ +#define REFRESH_SESSION_STATUS (1ULL << 4) /* Flush status variables */ +#define REFRESH_STATUS REFRESH_SESSION_STATUS #define REFRESH_THREADS (1ULL << 5) /* Flush thread cache */ -#define REFRESH_SLAVE (1ULL << 6) /* Reset master info and restart slave - thread */ +#define REFRESH_SLAVE (1ULL << 6) /* Reset master info and restart + slave thread */ #define REFRESH_MASTER (1ULL << 7) /* Remove all bin logs in the index and truncate the index */ @@ -218,6 +219,7 @@ enum enum_indicator_type #define REFRESH_USER_RESOURCES (1ULL << 19) #define REFRESH_FOR_EXPORT (1ULL << 20) /* FLUSH TABLES ... FOR EXPORT */ #define REFRESH_SSL (1ULL << 21) +#define REFRESH_GLOBAL_STATUS (1ULL << 22) /* Flush global status */ #define REFRESH_GENERIC (1ULL << 30) #define REFRESH_FAST (1ULL << 31) /* Intern flag */ diff --git a/mysql-test/include/check_key_reads.inc b/mysql-test/include/check_key_reads.inc index cfb754bccd4..df19b22ad1a 100644 --- a/mysql-test/include/check_key_reads.inc +++ b/mysql-test/include/check_key_reads.inc @@ -2,5 +2,5 @@ let $key_reads= query_get_value(SHOW STATUS LIKE 'key_reads',Value,1); --disable_query_log eval SELECT IF($key_reads = 0, "Yes!", "No!") as 'Zero key reads?'; -FLUSH STATUS; +FLUSH GLOBAL STATUS; --enable_query_log diff --git a/mysql-test/include/query_cache.inc b/mysql-test/include/query_cache.inc index 0f52b70b7f2..9e3ca549fea 100644 --- a/mysql-test/include/query_cache.inc +++ b/mysql-test/include/query_cache.inc @@ -31,7 +31,7 @@ set GLOBAL query_cache_size = 1355776; # # Without auto_commit. # -flush status; +flush global status; set autocommit=0; eval create table t1 (a int not null)$partitions_a; insert into t1 values (1),(2),(3); @@ -129,7 +129,7 @@ connection default; SHOW VARIABLES LIKE 'have_query_cache'; SET GLOBAL query_cache_size = 204800; -flush status; +flush global status; SET @@autocommit=1; eval SET SESSION DEFAULT_STORAGE_ENGINE = $engine_type; eval CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1))$partitions_s1; diff --git a/mysql-test/include/query_cache_partitions.inc b/mysql-test/include/query_cache_partitions.inc index 6c51300a5d5..15e8089388c 100644 --- a/mysql-test/include/query_cache_partitions.inc +++ b/mysql-test/include/query_cache_partitions.inc @@ -40,7 +40,7 @@ show create table t1; INSERT INTO t1 VALUES (1, now(), 0); -flush status; +flush global status; show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; @@ -76,7 +76,7 @@ show create table t1; INSERT INTO t1 VALUES (1, now(), 0); -flush status; +flush global status; show status like "Qcache_queries_in_cache"; show status like "Qcache_hits"; @@ -97,7 +97,7 @@ drop table t1; --echo # flush query cache; -flush status; +flush global status; SET GLOBAL query_cache_size=1024*1024*512; CREATE TABLE `t1` ( diff --git a/mysql-test/include/query_cache_sql_prepare.inc b/mysql-test/include/query_cache_sql_prepare.inc index 978213777a4..df716a1a296 100644 --- a/mysql-test/include/query_cache_sql_prepare.inc +++ b/mysql-test/include/query_cache_sql_prepare.inc @@ -30,7 +30,7 @@ connection default; set @initial_query_cache_size = @@global.query_cache_size; set @@global.query_cache_size=102400; -flush status; +flush global status; --disable_warnings drop table if exists t1; --enable_warnings @@ -485,7 +485,7 @@ drop table if exists t1; --enable_warnings create table t1 (a varchar(255)); insert into t1 (a) values ("Pack my box with five dozen liquor jugs."); -flush status; +flush global status; prepare stmt from "select a from t1"; execute stmt; set @@global.query_cache_size=0; diff --git a/mysql-test/main/cache_innodb.result b/mysql-test/main/cache_innodb.result index d6e67b472b0..4b371c5c668 100644 --- a/mysql-test/main/cache_innodb.result +++ b/mysql-test/main/cache_innodb.result @@ -4,7 +4,7 @@ SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; drop table if exists t1,t2,t3; set @save_query_cache_size = @@global.query_cache_size; set GLOBAL query_cache_size = 1355776; -flush status; +flush global status; set autocommit=0; create table t1 (a int not null); insert into t1 values (1),(2),(3); @@ -139,7 +139,7 @@ SHOW VARIABLES LIKE 'have_query_cache'; Variable_name Value have_query_cache YES SET GLOBAL query_cache_size = 204800; -flush status; +flush global status; SET @@autocommit=1; SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1)); diff --git a/mysql-test/main/connect.result b/mysql-test/main/connect.result index 43a4871cb8f..4a34a9a89ea 100644 --- a/mysql-test/main/connect.result +++ b/mysql-test/main/connect.result @@ -285,7 +285,7 @@ DROP USER mysqltest_u1@localhost; # -- Bug#35074: max_used_connections is not correct. -FLUSH STATUS; +FLUSH GLOBAL STATUS; SHOW STATUS LIKE 'max_used_connections'; Variable_name Value @@ -422,7 +422,7 @@ Warning 1287 '@@secure_auth' is deprecated and will be removed in a future relea # MDEV-19277: Add status variable that gets incremented if # connection is aborted prior to authentication # -flush status; +flush global status; SHOW GLOBAL STATUS LIKE 'Aborted_connects%'; Variable_name Value Aborted_connects 0 diff --git a/mysql-test/main/connect.test b/mysql-test/main/connect.test index 9758e2aec78..41e35d48d84 100644 --- a/mysql-test/main/connect.test +++ b/mysql-test/main/connect.test @@ -267,7 +267,7 @@ DROP USER mysqltest_u1@localhost; --echo # -- Bug#35074: max_used_connections is not correct. --echo -FLUSH STATUS; +FLUSH GLOBAL STATUS; --echo SHOW STATUS LIKE 'max_used_connections'; @@ -462,7 +462,7 @@ SET global secure_auth=default; --echo # connection is aborted prior to authentication --echo # -flush status; +flush global status; SHOW GLOBAL STATUS LIKE 'Aborted_connects%'; SET GLOBAL log_warnings=2; diff --git a/mysql-test/main/features.result b/mysql-test/main/features.result index f4caba6d317..c932173116a 100644 --- a/mysql-test/main/features.result +++ b/mysql-test/main/features.result @@ -1,6 +1,6 @@ drop table if exists t1; set sql_mode=""; -flush status; +flush global status; show status like "feature%"; Variable_name Value Feature_application_time_periods 0 diff --git a/mysql-test/main/features.test b/mysql-test/main/features.test index c0d15109132..bd6bc22b02f 100644 --- a/mysql-test/main/features.test +++ b/mysql-test/main/features.test @@ -11,7 +11,7 @@ set sql_mode=""; --disable_ps2_protocol -flush status; +flush global status; show status like "feature%"; diff --git a/mysql-test/main/flush_notembedded.result b/mysql-test/main/flush_notembedded.result index b0fa8a6dfbc..a41ba8eb784 100644 --- a/mysql-test/main/flush_notembedded.result +++ b/mysql-test/main/flush_notembedded.result @@ -67,3 +67,17 @@ DROP VIEW v0, v1, v2; # # End of 10.6 tests # +# +# MDEV-33145 Add FLUSH GLOBAL STATUS +# +CREATE USER mysqltest@localhost; +GRANT USAGE ON *.* TO mysqltest@localhost; +connect con1, localhost, mysqltest; +FLUSH STATUS; +FLUSH SESSION STATUS; +FLUSH GLOBAL STATUS; +ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation +disconnect con1; +connection default; +DROP USER mysqltest@localhost; +# End of 11.5 tests diff --git a/mysql-test/main/flush_notembedded.test b/mysql-test/main/flush_notembedded.test index 193ac026cb4..cf92e9a04a6 100644 --- a/mysql-test/main/flush_notembedded.test +++ b/mysql-test/main/flush_notembedded.test @@ -65,3 +65,21 @@ DROP VIEW v0, v1, v2; --echo # --echo # End of 10.6 tests --echo # + +--echo # +--echo # MDEV-33145 Add FLUSH GLOBAL STATUS +--echo # + +CREATE USER mysqltest@localhost; +GRANT USAGE ON *.* TO mysqltest@localhost; + +connect(con1, localhost, mysqltest); +FLUSH STATUS; +FLUSH SESSION STATUS; +--error ER_SPECIFIC_ACCESS_DENIED_ERROR +FLUSH GLOBAL STATUS; +disconnect con1; +connection default; +DROP USER mysqltest@localhost; + +--echo # End of 11.5 tests diff --git a/mysql-test/main/key_cache.result b/mysql-test/main/key_cache.result index 0ac03750081..daa76cace74 100644 --- a/mysql-test/main/key_cache.result +++ b/mysql-test/main/key_cache.result @@ -551,7 +551,7 @@ KEY_CACHE_NAME SEGMENTS SEGMENT_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_B default 1 NULL 2097152 1024 4 # 0 21 0 26 6 small NULL NULL 1048576 1024 1 # 0 1 0 2 1 flush tables; -flush status; +flush global status; select * from information_schema.key_caches where segment_number is null; KEY_CACHE_NAME SEGMENTS SEGMENT_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES default 1 NULL 2097152 1024 4 # 0 0 0 0 0 @@ -632,7 +632,7 @@ Table Op Msg_type Msg_text test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK flush tables; -flush status; +flush global status; update t1 set a='zzzz' where a='qqqq'; set statement optimizer_scan_setup_cost=0 for update t2 set i=1 where i=2; select * from information_schema.key_caches where segment_number is null; diff --git a/mysql-test/main/key_cache.test b/mysql-test/main/key_cache.test index 4d6c9ed9c72..fcb4387f98c 100644 --- a/mysql-test/main/key_cache.test +++ b/mysql-test/main/key_cache.test @@ -369,7 +369,7 @@ delete from t2; --replace_column 7 # select * from information_schema.key_caches where segment_number is null; -flush tables; flush status; +flush tables; flush global status; --replace_column 7 # select * from information_schema.key_caches where segment_number is null; @@ -423,7 +423,7 @@ select * from t2 where p between 1010 and 1020 ; select * from information_schema.key_caches where segment_number is null; analyze table t2; -flush tables; flush status; +flush tables; flush global status; update t1 set a='zzzz' where a='qqqq'; set statement optimizer_scan_setup_cost=0 for update t2 set i=1 where i=2; --replace_column 6 # 7 # diff --git a/mysql-test/main/mysqladmin.result b/mysql-test/main/mysqladmin.result index 8c28a5aabae..36141746db8 100644 --- a/mysql-test/main/mysqladmin.result +++ b/mysql-test/main/mysqladmin.result @@ -17,6 +17,34 @@ mysqld is alive # Creating an empty file 'cnf_file' # Using --defaults-extra-file option with 'cnf_file'. mysqld is alive +# +# MDEV-33992 mariadb-admin flush-status command should do +# FLUSH GLOBAL STATUS +# +flush session status; +flush global status; +connect con1,localhost,root,; +connect con2,localhost,root,; +connect con3,localhost,root,; +disconnect con1; +disconnect con2; +disconnect con3; +connection default; +show status like 'Max_used_connections'; +Variable_name Value +Max_used_connections 4 +show global status like 'Max_used_connections'; +Variable_name Value +Max_used_connections 4 +# +# Running mariadb-admin flush-status +# +show status like 'Max_used_connections'; +Variable_name Value +Max_used_connections 2 +show global status like 'Max_used_connections'; +Variable_name Value +Max_used_connections 2 # restart: --ssl-key=MYSQLTEST_VARDIR/tmp/ssl_key.pem --ssl-cert=MYSQLTEST_VARDIR/tmp/ssl_cert.pem connect ssl_con,localhost,root,,,,,SSL; SELECT VARIABLE_VALUE INTO @ssl_not_after FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_server_not_after'; @@ -26,3 +54,4 @@ Result OK # Cleanup # restart +# End of 11.5 diff --git a/mysql-test/main/mysqladmin.test b/mysql-test/main/mysqladmin.test index 07e23cfe25c..2575c008a96 100644 --- a/mysql-test/main/mysqladmin.test +++ b/mysql-test/main/mysqladmin.test @@ -52,6 +52,32 @@ EOF --error 1 --exec $MYSQLADMIN -u root -p 2>&1 > /dev/null +--echo # +--echo # MDEV-33992 mariadb-admin flush-status command should do +--echo # FLUSH GLOBAL STATUS +--echo # + +flush session status; +flush global status; +--connect (con1,localhost,root,) +--connect (con2,localhost,root,) +--connect (con3,localhost,root,) +--disconnect con1 +--disconnect con2 +--disconnect con3 + +--connection default +show status like 'Max_used_connections'; +show global status like 'Max_used_connections'; + +--echo # +--echo # Running mariadb-admin flush-status +--echo # +--exec $MYSQLADMIN flush-status + +show status like 'Max_used_connections'; +show global status like 'Max_used_connections'; + # # MDEV-19168 Reload SSL certificate # This test reloads server SSL certs ./mysqladmin flush-ssl, and checks that new SSL @@ -96,3 +122,5 @@ remove_file $ssl_key; # restart with usual SSL let $restart_parameters=; --source include/restart_mysqld.inc + +--echo # End of 11.5 diff --git a/mysql-test/main/partition_cache.result b/mysql-test/main/partition_cache.result index 0bd8d70e9cb..e193b19469a 100644 --- a/mysql-test/main/partition_cache.result +++ b/mysql-test/main/partition_cache.result @@ -4,7 +4,7 @@ SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; drop table if exists t1,t2,t3; set @save_query_cache_size = @@global.query_cache_size; set GLOBAL query_cache_size = 1355776; -flush status; +flush global status; set autocommit=0; create table t1 (a int not null) PARTITION BY KEY (a) PARTITIONS 3; insert into t1 values (1),(2),(3); @@ -121,7 +121,7 @@ SHOW VARIABLES LIKE 'have_query_cache'; Variable_name Value have_query_cache YES SET GLOBAL query_cache_size = 204800; -flush status; +flush global status; SET @@autocommit=1; SET SESSION DEFAULT_STORAGE_ENGINE = InnoDB; CREATE TABLE t2 (s1 int, s2 varchar(1000), key(s1)) PARTITION BY KEY (s1) PARTITIONS 3; diff --git a/mysql-test/main/partition_cache_innodb.result b/mysql-test/main/partition_cache_innodb.result index b6231297bc5..b287da6842a 100644 --- a/mysql-test/main/partition_cache_innodb.result +++ b/mysql-test/main/partition_cache_innodb.result @@ -28,7 +28,7 @@ t1 CREATE TABLE `t1` ( PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = InnoDB, PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) INSERT INTO t1 VALUES (1, now(), 0); -flush status; +flush global status; show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 0 @@ -79,7 +79,7 @@ SUBPARTITIONS 3 PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = InnoDB, PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = InnoDB) INSERT INTO t1 VALUES (1, now(), 0); -flush status; +flush global status; show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 0 @@ -107,7 +107,7 @@ drop table t1; # from previous transaction # flush query cache; -flush status; +flush global status; SET GLOBAL query_cache_size=1024*1024*512; CREATE TABLE `t1` ( `id` int(11) NOT NULL , diff --git a/mysql-test/main/partition_cache_myisam.result b/mysql-test/main/partition_cache_myisam.result index 89f27f6d4fc..72588a6758b 100644 --- a/mysql-test/main/partition_cache_myisam.result +++ b/mysql-test/main/partition_cache_myisam.result @@ -28,7 +28,7 @@ t1 CREATE TABLE `t1` ( PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = MyISAM, PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) INSERT INTO t1 VALUES (1, now(), 0); -flush status; +flush global status; show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 0 @@ -79,7 +79,7 @@ SUBPARTITIONS 3 PARTITION `month_2010_5` VALUES LESS THAN (734289) ENGINE = MyISAM, PARTITION `month_max` VALUES LESS THAN MAXVALUE ENGINE = MyISAM) INSERT INTO t1 VALUES (1, now(), 0); -flush status; +flush global status; show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 0 @@ -107,7 +107,7 @@ drop table t1; # from previous transaction # flush query cache; -flush status; +flush global status; SET GLOBAL query_cache_size=1024*1024*512; CREATE TABLE `t1` ( `id` int(11) NOT NULL , diff --git a/mysql-test/main/partition_key_cache.result b/mysql-test/main/partition_key_cache.result index fae7639d9bb..48996f3c2f3 100644 --- a/mysql-test/main/partition_key_cache.result +++ b/mysql-test/main/partition_key_cache.result @@ -25,7 +25,7 @@ c INT NOT NULL, PRIMARY KEY (a), KEY `inx_b` (b)); FLUSH TABLES; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET @a:=1167602400; CREATE VIEW v AS SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4; CREATE VIEW x AS SELECT 1 FROM v,v a,v b; @@ -45,7 +45,7 @@ p1 sp3 2043 DROP VIEW x; DROP VIEW v; FLUSH TABLES; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT COUNT(b) FROM t1 WHERE b >= 0; COUNT(b) 2048 @@ -56,7 +56,7 @@ reads vs requests reads == requests writes vs requests writes == requests -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT COUNT(b) FROM t2 WHERE b >= 0; COUNT(b) 2048 @@ -65,7 +65,7 @@ Yes! FLUSH TABLES; # Setting the default key cache to 1M SET GLOBAL key_buffer_size = 1024*1024; -FLUSH STATUS; +FLUSH GLOBAL STATUS; # All these have to read the indexes LOAD INDEX INTO CACHE t1 PARTITION (p1); Table Op Msg_type Msg_text diff --git a/mysql-test/main/partition_key_cache.test b/mysql-test/main/partition_key_cache.test index 365a571ae92..38c8c952c50 100644 --- a/mysql-test/main/partition_key_cache.test +++ b/mysql-test/main/partition_key_cache.test @@ -31,7 +31,7 @@ CREATE TABLE t2 ( PRIMARY KEY (a), KEY `inx_b` (b)); FLUSH TABLES; -FLUSH STATUS; +FLUSH GLOBAL STATUS; # Genereate 4096 rows. Idea from: # http://datacharmer.blogspot.com/2007/12/data-from-nothing-solution-to-pop-quiz.html @@ -46,7 +46,7 @@ CREATE VIEW x AS SELECT 1 FROM v,v a,v b; # SELECT IF(VARIABLE_VALUE = 0,"Yes!","No!") as 'Was zero reads?' # FROM INFORMATION_SCHEMA.SESSION_STATUS # WHERE VARIABLE_NAME = 'KEY_READS'; -# FLUSH STATUS; +# FLUSH GLOBAL STATUS; #END| #DELIMITER ;| @@ -58,18 +58,18 @@ SELECT PARTITION_NAME, SUBPARTITION_NAME, TABLE_ROWS FROM INFORMATION_SCHEMA.PAR DROP VIEW x; DROP VIEW v; FLUSH TABLES; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT COUNT(b) FROM t1 WHERE b >= 0; --source include/check_key_reads.inc INSERT t2 SELECT a,b,c FROM t1; --source include/check_key_req.inc -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT COUNT(b) FROM t2 WHERE b >= 0; --source include/check_key_reads.inc FLUSH TABLES; --echo # Setting the default key cache to 1M SET GLOBAL key_buffer_size = 1024*1024; -FLUSH STATUS; +FLUSH GLOBAL STATUS; --echo # All these have to read the indexes LOAD INDEX INTO CACHE t1 PARTITION (p1); --source include/check_key_reads.inc diff --git a/mysql-test/main/preload.result b/mysql-test/main/preload.result index 7ed0c62f33a..ad6488dda2b 100644 --- a/mysql-test/main/preload.result +++ b/mysql-test/main/preload.result @@ -45,7 +45,7 @@ select count(*) from t2; count(*) 20672 flush tables; -flush status; +flush global status; show status like "key_read%"; Variable_name Value Key_read_requests 0 @@ -65,7 +65,7 @@ Variable_name Value Key_read_requests 588 Key_reads 60 flush tables; -flush status; +flush global status; select @@preload_buffer_size; @@preload_buffer_size 32768 @@ -84,7 +84,7 @@ Variable_name Value Key_read_requests 1068 Key_reads 774 flush tables; -flush status; +flush global status; show status like "key_read%"; Variable_name Value Key_read_requests 0 @@ -108,7 +108,7 @@ Variable_name Value Key_read_requests 311 Key_reads 75 flush tables; -flush status; +flush global status; show status like "key_read%"; Variable_name Value Key_read_requests 0 @@ -136,7 +136,7 @@ Variable_name Value Key_read_requests 1266 Key_reads 821 flush tables; -flush status; +flush global status; show status like "key_read%"; Variable_name Value Key_read_requests 0 @@ -151,7 +151,7 @@ Variable_name Value Key_read_requests 478 Key_reads 478 flush tables; -flush status; +flush global status; show status like "key_read%"; Variable_name Value Key_read_requests 0 diff --git a/mysql-test/main/preload.test b/mysql-test/main/preload.test index f03ec16bff6..c0f4b843276 100644 --- a/mysql-test/main/preload.test +++ b/mysql-test/main/preload.test @@ -57,7 +57,7 @@ select count(*) from t1; select count(*) from t2; --disable_ps2_protocol -flush tables; flush status; +flush tables; flush global status; show status like "key_read%"; select count(*) from t1 where b = 'test1'; @@ -65,14 +65,14 @@ show status like "key_read%"; select count(*) from t1 where b = 'test1'; show status like "key_read%"; -flush tables; flush status; +flush tables; flush global status; select @@preload_buffer_size; load index into cache t1; show status like "key_read%"; select count(*) from t1 where b = 'test1'; show status like "key_read%"; -flush tables; flush status; +flush tables; flush global status; show status like "key_read%"; set session preload_buffer_size=256*1024; select @@preload_buffer_size; @@ -81,7 +81,7 @@ show status like "key_read%"; select count(*) from t1 where b = 'test1'; show status like "key_read%"; -flush tables; flush status; +flush tables; flush global status; show status like "key_read%"; set session preload_buffer_size=1*1024; select @@preload_buffer_size; @@ -91,12 +91,12 @@ select count(*) from t1 where b = 'test1'; select count(*) from t2 where b = 'test1'; show status like "key_read%"; -flush tables; flush status; +flush tables; flush global status; show status like "key_read%"; load index into cache t3, t2 key (primary,b) ; show status like "key_read%"; -flush tables; flush status; +flush tables; flush global status; show status like "key_read%"; load index into cache t3 key (b), t2 key (c) ; show status like "key_read%"; diff --git a/mysql-test/main/query_cache.result b/mysql-test/main/query_cache.result index 22d5305281d..f52f4cb016f 100644 --- a/mysql-test/main/query_cache.result +++ b/mysql-test/main/query_cache.result @@ -12,7 +12,7 @@ SET LOCAL query_cache_type= ON; flush query cache; flush query cache; reset query cache; -flush status; +flush global status; drop table if exists t1,t2,t3,t4,t11,t21,t1_1,t1_2,t9,t9_1,t9_2; drop database if exists mysqltest; drop table if exists ```a`; @@ -673,7 +673,7 @@ SET SQL_SELECT_LIMIT=DEFAULT; drop table t1; flush query cache; reset query cache; -flush status; +flush global status; set GLOBAL query_cache_size=1048576; create table t1 (a int not null); insert into t1 values (1),(2),(3); @@ -955,7 +955,7 @@ zyxwvutsrqponmlkjihgfedcbazyxwvutsrqponmlkjihgfedcbazyxwvutsrqponmlkjihgfedcbazy flush query cache; drop table t1, t2; set GLOBAL query_cache_size=1355776; -flush status; +flush global status; CREATE TABLE t1 ( `date` datetime NOT NULL default '0000-00-00 00:00:00', KEY `date` (`date`) @@ -990,7 +990,7 @@ drop table t1; create table t1 (a int); insert into t1 values (1); reset query cache; -flush status; +flush global status; select * from (select * from t1) a; a 1 @@ -1040,7 +1040,7 @@ Variable_name Value Qcache_hits 1 drop table t1; create table t1 (a int); -flush status; +flush global status; (select a from t1) union (select a from t1); a show status like "Qcache_queries_in_cache"; @@ -1117,7 +1117,7 @@ drop function f1// drop table t1// flush query cache; reset query cache; -flush status; +flush global status; create table t1 (s1 int)// create procedure f1 () begin select sql_cache * from t1; @@ -1176,7 +1176,7 @@ s1 1 flush query cache; reset query cache; -flush status; +flush global status; select sql_cache * from t1; s1 1 @@ -1309,7 +1309,7 @@ Last_query_cost 0.000000 drop table t1; SET GLOBAL query_cache_size=0; set global query_cache_size=1024*1024; -flush status; +flush global status; create table t1 (a int); insert into t1 (a) values (1), (2), (3); select * from t1; @@ -1674,7 +1674,7 @@ set GLOBAL query_cache_size=@save_query_cache_size; set local query_cache_type=default; set GLOBAL query_cache_type=on; set local query_cache_type=on; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET GLOBAL query_cache_size=10*1024*1024; SET @save_concurrent_insert= @@concurrent_insert; SET GLOBAL concurrent_insert= 0; @@ -1701,7 +1701,7 @@ DROP TABLE t1; SET GLOBAL concurrent_insert= @save_concurrent_insert; SET GLOBAL query_cache_size= default; DROP TABLE IF EXISTS t1; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET GLOBAL query_cache_size=1048576; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2),(3),(4),(5); @@ -1956,7 +1956,7 @@ set GLOBAL query_cache_size=1355776; FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; reset query cache; -flush status; +flush global status; create table t1 (a int); insert into t1 values (1); select * from t1; @@ -1993,7 +1993,7 @@ Qcache_hits 2 drop table t1; FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; -flush status; +flush global status; create table t1 (a int); select * from t1; a @@ -2025,7 +2025,7 @@ Variable_name Value Qcache_hits 2 FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; -flush status; +flush global status; create procedure p1() select * from t1; call p1; @@ -2058,7 +2058,7 @@ Variable_name Value Qcache_hits 2 FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; -flush status; +flush global status; SET GLOBAL query_cache_size= 0; call p1; a @@ -2122,7 +2122,7 @@ SET GLOBAL query_cache_size= @qc; # CREATE DATABASE `foo.bar`; use `foo.bar`; -flush status; +flush global status; CREATE TABLE moocow (a int); INSERT INTO moocow VALUES (1), (2), (3); SHOW STATUS LIKE 'Qcache_inserts'; @@ -2154,7 +2154,7 @@ End of 10.0 tests # MDEV-10766 Queries which start with WITH clause do not get # inserted into query cache # -flush status; +flush global status; show status like "Qcache_inserts"; Variable_name Value Qcache_inserts 0 @@ -2242,7 +2242,7 @@ SET GLOBAL query_cache_size= @qc; # create table t1 (a text); insert into t1 values ('{"a":"foo"}'); -flush status; +flush global status; SHOW STATUS LIKE 'Qcache_inserts'; Variable_name Value Qcache_inserts 0 @@ -2272,7 +2272,7 @@ set global query_cache_type= 1; set query_cache_type= 1; create table t1 (a int); insert into t1 values (1000); -flush status; +flush global status; select * from information_schema.global_status where variable_name in ('Qcache_inserts','Qcache_hits') order by variable_name; VARIABLE_NAME VARIABLE_VALUE QCACHE_HITS 0 diff --git a/mysql-test/main/query_cache.test b/mysql-test/main/query_cache.test index feb9ecf526c..1df14d30d85 100644 --- a/mysql-test/main/query_cache.test +++ b/mysql-test/main/query_cache.test @@ -24,7 +24,7 @@ SET LOCAL query_cache_type= ON; flush query cache; # This crashed in some versions flush query cache; # This crashed in some versions reset query cache; -flush status; +flush global status; --disable_warnings drop table if exists t1,t2,t3,t4,t11,t21,t1_1,t1_2,t9,t9_1,t9_2; drop database if exists mysqltest; @@ -465,7 +465,7 @@ drop table t1; # flush query cache; reset query cache; -flush status; +flush global status; set GLOBAL query_cache_size=1048576; create table t1 (a int not null); @@ -732,7 +732,7 @@ set GLOBAL query_cache_size=1355776; # # Query with warning prohibited to query cache (BUG#9414) # -flush status; +flush global status; CREATE TABLE t1 ( `date` datetime NOT NULL default '0000-00-00 00:00:00', KEY `date` (`date`) @@ -754,7 +754,7 @@ drop table t1; create table t1 (a int); insert into t1 values (1); reset query cache; -flush status; +flush global status; select * from (select * from t1) a; show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; @@ -777,7 +777,7 @@ drop table t1; # BUG#14652: Queries with leading '(' characters. # create table t1 (a int); -flush status; +flush global status; (select a from t1) union (select a from t1); show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; @@ -845,7 +845,7 @@ delimiter ;// # flush query cache; reset query cache; -flush status; +flush global status; delimiter //; create table t1 (s1 int)// create procedure f1 () begin @@ -880,7 +880,7 @@ call f1(); select sql_cache * from t1; flush query cache; reset query cache; -flush status; +flush global status; select sql_cache * from t1; select sql_cache * from t1 where s1=1; call f1(); @@ -926,7 +926,7 @@ SET GLOBAL query_cache_size=0; # Bug #20045: Server crash on INSERT ... SELECT ... FROM non-mergeable view # set global query_cache_size=1024*1024; -flush status; +flush global status; create table t1 (a int); insert into t1 (a) values (1), (2), (3); select * from t1; @@ -1282,7 +1282,7 @@ set local query_cache_type=on; # # Bug#33756 - query cache with concurrent_insert=0 appears broken # -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET GLOBAL query_cache_size=10*1024*1024; SET @save_concurrent_insert= @@concurrent_insert; SET GLOBAL concurrent_insert= 0; @@ -1306,7 +1306,7 @@ SET GLOBAL query_cache_size= default; DROP TABLE IF EXISTS t1; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET GLOBAL query_cache_size=1048576; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1),(2),(3),(4),(5); @@ -1645,7 +1645,7 @@ set GLOBAL query_cache_size=1355776; FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; reset query cache; -flush status; +flush global status; create table t1 (a int); insert into t1 values (1); @@ -1666,7 +1666,7 @@ show status like "Qcache_hits"; drop table t1; FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; -flush status; +flush global status; create table t1 (a int); select * from t1; @@ -1685,7 +1685,7 @@ show status like "Qcache_hits"; FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; -flush status; +flush global status; create procedure p1() select * from t1; @@ -1705,7 +1705,7 @@ show status like "Qcache_hits"; FLUSH USER_STATISTICS; FLUSH CLIENT_STATISTICS; -flush status; +flush global status; SET GLOBAL query_cache_size= 0; call p1; @@ -1761,7 +1761,7 @@ SET GLOBAL query_cache_size= @qc; --echo # CREATE DATABASE `foo.bar`; use `foo.bar`; -flush status; +flush global status; CREATE TABLE moocow (a int); INSERT INTO moocow VALUES (1), (2), (3); SHOW STATUS LIKE 'Qcache_inserts'; @@ -1779,7 +1779,7 @@ drop database `foo.bar`; --echo # MDEV-10766 Queries which start with WITH clause do not get --echo # inserted into query cache --echo # -flush status; +flush global status; show status like "Qcache_inserts"; create table t1 (i int); with cte as (select * from t1) select * from cte; @@ -1859,7 +1859,7 @@ SET GLOBAL query_cache_size= @qc; --echo # create table t1 (a text); insert into t1 values ('{"a":"foo"}'); -flush status; +flush global status; SHOW STATUS LIKE 'Qcache_inserts'; select * from t1, json_table(t1.a, '$' columns (f varchar(20) path '$.a')) as jt; SHOW STATUS LIKE 'Qcache_inserts'; @@ -1889,7 +1889,7 @@ set query_cache_type= 1; create table t1 (a int); insert into t1 values (1000); -flush status; +flush global status; --let $v1 = `select hex(random_bytes(a)) from t1` select * from information_schema.global_status where variable_name in ('Qcache_inserts','Qcache_hits') order by variable_name; diff --git a/mysql-test/main/query_cache_notembedded.result b/mysql-test/main/query_cache_notembedded.result index 3477161e9cf..f74d1368c03 100644 --- a/mysql-test/main/query_cache_notembedded.result +++ b/mysql-test/main/query_cache_notembedded.result @@ -111,7 +111,7 @@ disconnect root; disconnect root2; flush query cache; reset query cache; -flush status; +flush global status; create table t1 (s1 int)// create procedure f1 () begin select sql_cache * from t1; @@ -215,7 +215,7 @@ Variable_name Value Qcache_hits 10 flush query cache; reset query cache; -flush status; +flush global status; select sql_cache * from t1; s1 1 @@ -374,7 +374,7 @@ connection default; set GLOBAL query_cache_size=0; SET @@global.log_bin_trust_function_creators = @old_log_bin_trust_function_creators; DROP DATABASE IF EXISTS bug30269; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE DATABASE bug30269; USE bug30269; CREATE TABLE test1 (id int, name varchar(23)); @@ -427,7 +427,7 @@ end| insert into t1 values ("x", 3), ("y", 5)| set @x = @@query_cache_size| set global query_cache_size = 10*1024*1024| -flush status| +flush global status| flush query cache| show status like 'Qcache_hits'| Variable_name Value @@ -457,7 +457,7 @@ show status like 'Qcache_hits'| Variable_name Value Qcache_hits 2 set global query_cache_size = @x| -flush status| +flush global status| flush query cache| delete from t1| drop procedure bug3583| diff --git a/mysql-test/main/query_cache_notembedded.test b/mysql-test/main/query_cache_notembedded.test index 5f97dc5c00d..4b0da6a5553 100644 --- a/mysql-test/main/query_cache_notembedded.test +++ b/mysql-test/main/query_cache_notembedded.test @@ -116,7 +116,7 @@ disconnect root2; --disable_ps2_protocol flush query cache; reset query cache; -flush status; +flush global status; delimiter //; create table t1 (s1 int)// create procedure f1 () begin @@ -167,7 +167,7 @@ show status like "Qcache_inserts"; show status like "Qcache_hits"; flush query cache; reset query cache; -flush status; +flush global status; select sql_cache * from t1; select sql_cache * from t1 where s1=1; call f1(); @@ -251,7 +251,7 @@ SET @@global.log_bin_trust_function_creators = @old_log_bin_trust_function_creat --disable_warnings DROP DATABASE IF EXISTS bug30269; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE DATABASE bug30269; USE bug30269; CREATE TABLE test1 (id int, name varchar(23)); @@ -310,7 +310,7 @@ insert into t1 values ("x", 3), ("y", 5)| set @x = @@query_cache_size| set global query_cache_size = 10*1024*1024| -flush status| +flush global status| flush query cache| show status like 'Qcache_hits'| call bug3583()| @@ -320,7 +320,7 @@ call bug3583()| show status like 'Qcache_hits'| set global query_cache_size = @x| -flush status| +flush global status| flush query cache| delete from t1| drop procedure bug3583| diff --git a/mysql-test/main/query_cache_ps_no_prot.result b/mysql-test/main/query_cache_ps_no_prot.result index 94986da49f0..e0e46e03dbb 100644 --- a/mysql-test/main/query_cache_ps_no_prot.result +++ b/mysql-test/main/query_cache_ps_no_prot.result @@ -4,7 +4,7 @@ connect con1,localhost,root,,test,$MASTER_MYPORT,; connection default; set @initial_query_cache_size = @@global.query_cache_size; set @@global.query_cache_size=102400; -flush status; +flush global status; drop table if exists t1; create table t1(c1 int); insert into t1 values(1),(10),(100); @@ -540,7 +540,7 @@ use test; drop table if exists t1; create table t1 (a varchar(255)); insert into t1 (a) values ("Pack my box with five dozen liquor jugs."); -flush status; +flush global status; prepare stmt from "select a from t1"; execute stmt; a diff --git a/mysql-test/main/query_cache_ps_ps_prot.result b/mysql-test/main/query_cache_ps_ps_prot.result index 16cad15450e..77f4db27c03 100644 --- a/mysql-test/main/query_cache_ps_ps_prot.result +++ b/mysql-test/main/query_cache_ps_ps_prot.result @@ -4,7 +4,7 @@ connect con1,localhost,root,,test,$MASTER_MYPORT,; connection default; set @initial_query_cache_size = @@global.query_cache_size; set @@global.query_cache_size=102400; -flush status; +flush global status; drop table if exists t1; create table t1(c1 int); insert into t1 values(1),(10),(100); @@ -540,7 +540,7 @@ use test; drop table if exists t1; create table t1 (a varchar(255)); insert into t1 (a) values ("Pack my box with five dozen liquor jugs."); -flush status; +flush global status; prepare stmt from "select a from t1"; execute stmt; a diff --git a/mysql-test/main/query_cache_with_views.result b/mysql-test/main/query_cache_with_views.result index 8cb3d8cb297..7ef7f1bcef0 100644 --- a/mysql-test/main/query_cache_with_views.result +++ b/mysql-test/main/query_cache_with_views.result @@ -5,7 +5,7 @@ set @save_query_cache_type=@@global.query_cache_type; set GLOBAL query_cache_type=ON; set LOCAL query_cache_type=ON; set GLOBAL query_cache_size=1355776; -flush status; +flush global status; create table t1 (a int, b int); create view v1 (c,d) as select sql_no_cache a,b from t1; create view v2 (c,d) as select a+rand(),b from t1; @@ -46,7 +46,7 @@ Variable_name Value Qcache_hits 0 drop view v1,v2; set query_cache_type=demand; -flush status; +flush global status; create view v1 (c,d) as select sql_cache a,b from t1; show status like "Qcache_queries_in_cache"; Variable_name Value @@ -136,7 +136,7 @@ unlock tables; set query_cache_wlock_invalidate=default; drop view v1; drop table t1; -flush status; +flush global status; create table t1 (a int, b int); create algorithm=temptable view v1 as select * from t1; select * from v1; diff --git a/mysql-test/main/query_cache_with_views.test b/mysql-test/main/query_cache_with_views.test index 6740c70883e..18b5a8323fd 100644 --- a/mysql-test/main/query_cache_with_views.test +++ b/mysql-test/main/query_cache_with_views.test @@ -15,7 +15,7 @@ set LOCAL query_cache_type=ON; set GLOBAL query_cache_size=1355776; --disable_ps2_protocol -flush status; +flush global status; create table t1 (a int, b int); # queries with following views should not be in query cache @@ -41,7 +41,7 @@ drop view v1,v2; # SQL_CACHE option set query_cache_type=demand; --disable_ps2_protocol -flush status; +flush global status; # query with view will be cached, but direct acess to table will not create view v1 (c,d) as select sql_cache a,b from t1; show status like "Qcache_queries_in_cache"; @@ -111,7 +111,7 @@ drop table t1; # BUG#15119: returning temptable view from the query cache. # --disable_ps2_protocol -flush status; +flush global status; create table t1 (a int, b int); create algorithm=temptable view v1 as select * from t1; select * from v1; diff --git a/mysql-test/main/status.result b/mysql-test/main/status.result index 9a4dd7c9302..6202648de99 100644 --- a/mysql-test/main/status.result +++ b/mysql-test/main/status.result @@ -5,7 +5,7 @@ SET GLOBAL LOG_OUTPUT = 'FILE'; connect con1,localhost,root,,; connect con2,localhost,root,,; connection default; -flush status; +flush global status; show status like 'Table_lock%'; Variable_name Value Table_locks_immediate 0 @@ -82,7 +82,7 @@ show status like 'last_query_cost'; Variable_name Value Last_query_cost 0.000000 drop table t1; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SHOW STATUS LIKE 'max_used_connections'; Variable_name Value Max_used_connections 1 @@ -101,7 +101,7 @@ Max_used_connections 3 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'max_used_connections'; VARIABLE_NAME VARIABLE_VALUE MAX_USED_CONNECTIONS 3 -FLUSH STATUS; +FLUSH GLOBAL STATUS; SHOW STATUS LIKE 'max_used_connections'; Variable_name Value Max_used_connections 2 @@ -450,7 +450,7 @@ SET GLOBAL log_output = @old_log_output; # # MDEV-30543 New status variable: Max_used_connections_time # -FLUSH STATUS; +FLUSH GLOBAL STATUS; connect con1,localhost,root,,; connect con2,localhost,root,,; connection con1; @@ -466,3 +466,21 @@ expect_1 disconnect con4; disconnect con3; disconnect con1; +connection default; +# Test Uptime_since_flush_status +# All results below should be 1 +flush global status; +flush session status; +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +# +# end of 11.5 tests +# diff --git a/mysql-test/main/status.test b/mysql-test/main/status.test index acf29f35b9e..33e73756b05 100644 --- a/mysql-test/main/status.test +++ b/mysql-test/main/status.test @@ -25,7 +25,7 @@ connect (con1,localhost,root,,); connect (con2,localhost,root,,); connection default; -flush status; +flush global status; show status like 'Table_lock%'; select * from information_schema.session_status where variable_name like 'Table_lock%'; @@ -121,7 +121,7 @@ drop table t1; let $disconnect_timeout = 10; # Wait for any previous disconnects to finish. -FLUSH STATUS; +FLUSH GLOBAL STATUS; --disable_query_log --disable_result_log eval SET @wait_left = $disconnect_timeout; @@ -131,7 +131,7 @@ let $wait_more = `SELECT @max_used_connections != 1 && @wait_left > 0`; while ($wait_more) { sleep 1; - FLUSH STATUS; + FLUSH GLOBAL STATUS; SET @wait_left = @wait_left - 1; let $max_used_connections = `SHOW STATUS LIKE 'max_used_connections'`; eval SET @max_used_connections = SUBSTRING('$max_used_connections', 21)+0; @@ -160,7 +160,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'max_us # Check that after flush max_used_connections equals to current number # of connections. First wait for previous disconnect to finish. -FLUSH STATUS; +FLUSH GLOBAL STATUS; --disable_query_log --disable_result_log eval SET @wait_left = $disconnect_timeout; @@ -170,7 +170,7 @@ let $wait_more = `SELECT @max_used_connections != 2 && @wait_left > 0`; while ($wait_more) { sleep 1; - FLUSH STATUS; + FLUSH GLOBAL STATUS; SET @wait_left = @wait_left - 1; let $max_used_connections = `SHOW STATUS LIKE 'max_used_connections'`; eval SET @max_used_connections = SUBSTRING('$max_used_connections', 21)+0; @@ -446,7 +446,7 @@ SET GLOBAL log_output = @old_log_output; --echo # MDEV-30543 New status variable: Max_used_connections_time --echo # -FLUSH STATUS; +FLUSH GLOBAL STATUS; connect (con1,localhost,root,,); --sleep 1 @@ -472,4 +472,42 @@ eval SELECT '$time_1' < '$time_3' as expect_1; disconnect con4; disconnect con3; disconnect con1; +connection default; +--echo # Test Uptime_since_flush_status +--echo # All results below should be 1 + +flush global status; +flush session status; + +--sleep 1 + +let $global_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`; +let $local_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`; + +--sleep 2 + +--disable_query_log +--eval select $global_flush_status >= $local_flush_status as "1" +flush session status; + +let $new_global_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`; +let $new_local_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`; + +--eval select $new_global_flush_status >= $global_flush_status as "1" +--eval select $new_local_flush_status < $global_flush_status as "1" + +--sleep 2 +flush global status; + +let $local_flush_status=$new_local_flush_status; +let $new_global_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`; +let $new_local_flush_status= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'Uptime_since_flush_status'`; + +--eval select $new_local_flush_status >= $local_flush_status as "1" +--eval select $new_global_flush_status < $new_local_flush_status as "1" + +--enable_query_log +--echo # +--echo # end of 11.5 tests +--echo # diff --git a/mysql-test/main/subselect.result b/mysql-test/main/subselect.result index 08a0f240a69..5e1a2563f29 100644 --- a/mysql-test/main/subselect.result +++ b/mysql-test/main/subselect.result @@ -7007,6 +7007,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m @@ -7049,6 +7050,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m diff --git a/mysql-test/main/subselect.test b/mysql-test/main/subselect.test index 4b49a34f49e..8ab3a3671b2 100644 --- a/mysql-test/main/subselect.test +++ b/mysql-test/main/subselect.test @@ -5868,6 +5868,7 @@ FROM t2 alias1, t1 alias2, t1 alias3; --disable_ps2_protocol flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 @@ -5886,6 +5887,7 @@ SELECT FROM t2 alias1, t1 alias2, t1 alias3; flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 diff --git a/mysql-test/main/subselect_cache.result b/mysql-test/main/subselect_cache.result index 727e60e4b7d..cc670480165 100644 --- a/mysql-test/main/subselect_cache.result +++ b/mysql-test/main/subselect_cache.result @@ -12,6 +12,7 @@ insert into t2 values (2,3),(3,4),(5,6),(4,1); * Test subquery as top item in different clauses * #single value subquery test (SELECT list) +flush global status; flush status; select a, (select d from t2 where b=c) from t1; a (select d from t2 where b=c) @@ -359,6 +360,7 @@ EXPLAIN } } set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select a, (select d from t2 where b=c) from t1; a (select d from t2 where b=c) @@ -389,6 +391,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 61 set optimizer_switch='subquery_cache=on'; #single value subquery test (where) +flush global status; flush status; select a from t1 where (select d from t2 where b=c); a @@ -416,6 +419,7 @@ Handler_read_rnd 0 Handler_read_rnd_deleted 0 Handler_read_rnd_next 31 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select a from t1 where (select d from t2 where b=c); a @@ -444,6 +448,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 61 set optimizer_switch='subquery_cache=on'; #single value subquery test (having) +flush global status; flush status; select a from t1 where a > 0 having (select d from t2 where b=c); a @@ -471,6 +476,7 @@ Handler_read_rnd 0 Handler_read_rnd_deleted 0 Handler_read_rnd_next 31 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select a from t1 where a > 0 having (select d from t2 where b=c); a @@ -499,6 +505,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 61 set optimizer_switch='subquery_cache=on'; #single value subquery test (OUTER JOIN ON) +flush global status; flush status; select ta.a, tb.a from t1 ta join t1 tb on (select d from t2 where tb.b=c); a a @@ -598,6 +605,7 @@ Handler_read_rnd 0 Handler_read_rnd_deleted 0 Handler_read_rnd_next 442 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select ta.a, tb.a from t1 ta join t1 tb on (select d from t2 where tb.b=c); a a @@ -698,6 +706,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 472 set optimizer_switch='subquery_cache=on'; #single value subquery test (GROUP BY) +flush global status; flush status; select max(a) from t1 GROUP BY (select d from t2 where b=c); max(a) @@ -721,6 +730,7 @@ Handler_read_rnd 4 Handler_read_rnd_deleted 0 Handler_read_rnd_next 36 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select max(a) from t1 GROUP BY (select d from t2 where b=c); max(a) @@ -745,6 +755,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 86 set optimizer_switch='subquery_cache=on'; #single value subquery test (distinct GROUP BY) +flush global status; flush status; select distinct max(a) from t1 GROUP BY (select d from t2 where b=c); max(a) @@ -768,6 +779,7 @@ Handler_read_rnd 4 Handler_read_rnd_deleted 0 Handler_read_rnd_next 41 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select distinct max(a) from t1 GROUP BY (select d from t2 where b=c); max(a) @@ -792,6 +804,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 91 set optimizer_switch='subquery_cache=on'; #single value subquery test (ORDER BY) +flush global status; flush status; select a from t1 ORDER BY (select d from t2 where b=c); a @@ -821,6 +834,7 @@ Handler_read_rnd 0 Handler_read_rnd_deleted 0 Handler_read_rnd_next 31 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select a from t1 ORDER BY (select d from t2 where b=c); a @@ -851,6 +865,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 61 set optimizer_switch='subquery_cache=on'; #single value subquery test (distinct ORDER BY) +flush global status; flush status; select distinct a from t1 ORDER BY (select d from t2 where b=c); a @@ -874,6 +889,7 @@ Handler_read_rnd 4 Handler_read_rnd_deleted 1 Handler_read_rnd_next 36 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select distinct a from t1 ORDER BY (select d from t2 where b=c); a @@ -898,6 +914,7 @@ Handler_read_rnd_deleted 1 Handler_read_rnd_next 66 set optimizer_switch='subquery_cache=on'; #single value subquery test (LEFT JOIN ON) +flush global status; flush status; select ta.a, tb.a from t1 ta left join t1 tb on (select d from t2 where tb.b=c); a a @@ -997,6 +1014,7 @@ Handler_read_rnd 0 Handler_read_rnd_deleted 0 Handler_read_rnd_next 141 set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select ta.a, tb.a from t1 ta left join t1 tb on (select d from t2 where tb.b=c); a a @@ -1159,6 +1177,7 @@ a (select d from t2 where b=c) + 1 4 7 drop procedure p1; #IN subquery test +flush global status; flush status; show status like "subquery_cache%"; Variable_name Value @@ -1219,6 +1238,7 @@ Variable_name Value Subquery_cache_hit 18 Subquery_cache_miss 16 # multicolumn NOT IN with NULLs +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (b, a) not in (select d, c from t2) as SUBS from t1; @@ -1259,6 +1279,7 @@ Variable_name Value Subquery_cache_hit 6 Subquery_cache_miss 6 # multicolumn NOT IN with NULLs (other order) +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (a, b) not in (select d, c from t2) as SUBS from t1; @@ -1299,6 +1320,7 @@ Variable_name Value Subquery_cache_hit 6 Subquery_cache_miss 6 # multicolumn IN with NULLs +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (b, a) in (select d, c from t2) as SUBS from t1; @@ -1339,6 +1361,7 @@ Variable_name Value Subquery_cache_hit 6 Subquery_cache_miss 6 # multicolumn IN with NULLs (other order) +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (a, b) in (select d, c from t2) as SUBS from t1; @@ -1691,6 +1714,7 @@ a b SUBS drop procedure p1; #several subqueries set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select a, b , exists (select * from t2 where b=d) as SUBSE, b in (select d from t2) as SUBSI, (select d from t2 where b=c) SUBSR from t1; a b SUBSE SUBSI SUBSR @@ -1722,6 +1746,7 @@ Handler_read_rnd 0 Handler_read_rnd_deleted 0 Handler_read_rnd_next 145 set optimizer_switch='subquery_cache=on'; +flush global status; flush status; select a, b , exists (select * from t2 where b=d) as SUBSE, b in (select d from t2) as SUBSI, (select d from t2 where b=c) SUBSR from t1; a b SUBSE SUBSI SUBSR @@ -1754,8 +1779,10 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 84 #several subqueries (several levels) set optimizer_switch='subquery_cache=off'; +flush global status; flush status; set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select a, b, (select exists (select * from t2 where b=d) from t2 where b=c) as SUNS1 from t1; a b SUNS1 @@ -1787,6 +1814,7 @@ Handler_read_rnd 0 Handler_read_rnd_deleted 0 Handler_read_rnd_next 127 set optimizer_switch='subquery_cache=on'; +flush global status; flush status; select a, b, (select exists (select * from t2 where b=d) from t2 where b=c) as SUNS1 from t1; a b SUNS1 @@ -1917,6 +1945,7 @@ POINT(1 1) POINT(3 3) DROP TABLE t1; #uncacheable queries test (random and side effect) +flush global status; flush status; CREATE TABLE t1 (a int); INSERT INTO t1 VALUES (2), (4), (1), (3); @@ -1983,6 +2012,7 @@ insert into t1 values (2,1), (3,1), (2,4), (3,4), (10,2), (20,2), (2,5), insert into t2 values (1,1),(3,3),(20,20); aggregate function as parameter of subquery set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select max(a), (select max(a) from t2 where max(a)=c) from t1 group by b; max(a) (select max(a) from t2 where max(a)=c) @@ -2010,6 +2040,7 @@ Handler_read_rnd 8 Handler_read_rnd_deleted 0 Handler_read_rnd_next 57 set optimizer_switch='subquery_cache=on'; +flush global status; flush status; select max(a), (select max(a) from t2 where max(a)=c) from t1 group by b; max(a) (select max(a) from t2 where max(a)=c) @@ -2038,6 +2069,7 @@ Handler_read_rnd_deleted 0 Handler_read_rnd_next 37 argument of aggregate function as parameter of subquery (illegal use) set optimizer_switch='subquery_cache=off'; +flush global status; flush status; select max(a), (select a from t2 where a=c) from t1 group by b; max(a) (select a from t2 where a=c) @@ -2065,6 +2097,7 @@ Handler_read_rnd 8 Handler_read_rnd_deleted 0 Handler_read_rnd_next 57 set optimizer_switch='subquery_cache=on'; +flush global status; flush status; select max(a), (select a from t2 where a=c) from t1 group by b; max(a) (select a from t2 where a=c) @@ -2101,6 +2134,7 @@ insert into t1 values create table t2 (pk int, a int, primary key(pk)); insert into t2 select a,a from t0; set optimizer_switch='default,semijoin=on,materialization=on,subquery_cache=on'; +flush global status; flush status; select * from t1 where a in (select pk from t2); a b @@ -2140,6 +2174,7 @@ explain select * from t1 where a in (select pk from t2); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 15 Using where 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 10 Using where +flush global status; flush status; select * from t1 where a in (select pk from t2); a b @@ -2178,6 +2213,7 @@ explain select * from t1 where a in (select pk from t2); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 15 Using where 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 10 Using where +flush global status; flush status; select * from t1 where a in (select pk from t2); a b @@ -2216,6 +2252,7 @@ explain select * from t1 where a in (select pk from t2); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 15 Using where 2 MATERIALIZED t2 ALL NULL NULL NULL NULL 10 +flush global status; flush status; select * from t1 where a in (select pk from t2); a b diff --git a/mysql-test/main/subselect_cache.test b/mysql-test/main/subselect_cache.test index 2149df2b264..db095cbdcad 100644 --- a/mysql-test/main/subselect_cache.test +++ b/mysql-test/main/subselect_cache.test @@ -23,7 +23,7 @@ insert into t2 values (2,3),(3,4),(5,6),(4,1); --echo * --echo #single value subquery test (SELECT list) --disable_ps2_protocol -flush status; +flush global status; flush status; select a, (select d from t2 where b=c) from t1; show status like "subquery_cache%"; @@ -42,7 +42,7 @@ select a, (select d from t2 where b=c) from t1; explain format=json select a, (select d from t2 where b=c), (select d from t2 where b=c union select 1 order by 1 limit 1) from t1; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select a, (select d from t2 where b=c) from t1; @@ -52,14 +52,14 @@ set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (where) -flush status; +flush global status; flush status; select a from t1 where (select d from t2 where b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select a from t1 where (select d from t2 where b=c); @@ -68,14 +68,14 @@ show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (having) -flush status; +flush global status; flush status; select a from t1 where a > 0 having (select d from t2 where b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select a from t1 where a > 0 having (select d from t2 where b=c); @@ -84,14 +84,14 @@ show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (OUTER JOIN ON) -flush status; +flush global status; flush status; select ta.a, tb.a from t1 ta join t1 tb on (select d from t2 where tb.b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select ta.a, tb.a from t1 ta join t1 tb on (select d from t2 where tb.b=c); @@ -100,14 +100,14 @@ show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (GROUP BY) -flush status; +flush global status; flush status; select max(a) from t1 GROUP BY (select d from t2 where b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select max(a) from t1 GROUP BY (select d from t2 where b=c); show status like "subquery_cache%"; @@ -115,14 +115,14 @@ show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (distinct GROUP BY) -flush status; +flush global status; flush status; select distinct max(a) from t1 GROUP BY (select d from t2 where b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select distinct max(a) from t1 GROUP BY (select d from t2 where b=c); show status like "subquery_cache%"; @@ -130,14 +130,14 @@ show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (ORDER BY) -flush status; +flush global status; flush status; select a from t1 ORDER BY (select d from t2 where b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select a from t1 ORDER BY (select d from t2 where b=c); show status like "subquery_cache%"; @@ -145,14 +145,14 @@ show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (distinct ORDER BY) -flush status; +flush global status; flush status; select distinct a from t1 ORDER BY (select d from t2 where b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select distinct a from t1 ORDER BY (select d from t2 where b=c); show status like "subquery_cache%"; @@ -160,14 +160,14 @@ show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; --echo #single value subquery test (LEFT JOIN ON) -flush status; +flush global status; flush status; select ta.a, tb.a from t1 ta left join t1 tb on (select d from t2 where tb.b=c); show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select ta.a, tb.a from t1 ta left join t1 tb on (select d from t2 where tb.b=c); @@ -192,7 +192,7 @@ call p1; drop procedure p1; --echo #IN subquery test -flush status; +flush global status; flush status; show status like "subquery_cache%"; select a, b , b in (select d from t2) as SUBS from t1; @@ -207,7 +207,7 @@ select a, b , b in (select d from t2) as SUBS from t1; show status like "subquery_cache%"; --echo # multicolumn NOT IN with NULLs -flush status; +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (b, a) not in (select d, c from t2) as SUBS from t1; show status like "subquery_cache%"; @@ -217,7 +217,7 @@ select a, b, (b, a) not in (select d, c from t2) as SUBS from t1; show status like "subquery_cache%"; --echo # multicolumn NOT IN with NULLs (other order) -flush status; +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (a, b) not in (select d, c from t2) as SUBS from t1; show status like "subquery_cache%"; @@ -227,7 +227,7 @@ select a, b, (a, b) not in (select d, c from t2) as SUBS from t1; show status like "subquery_cache%"; --echo # multicolumn IN with NULLs -flush status; +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (b, a) in (select d, c from t2) as SUBS from t1; show status like "subquery_cache%"; @@ -237,7 +237,7 @@ select a, b, (b, a) in (select d, c from t2) as SUBS from t1; show status like "subquery_cache%"; --echo # multicolumn IN with NULLs (other order) -flush status; +flush global status; flush status; set optimizer_switch='subquery_cache=off'; select a, b, (a, b) in (select d, c from t2) as SUBS from t1; show status like "subquery_cache%"; @@ -317,30 +317,30 @@ drop procedure p1; --echo #several subqueries set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select a, b , exists (select * from t2 where b=d) as SUBSE, b in (select d from t2) as SUBSI, (select d from t2 where b=c) SUBSR from t1; show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; -flush status; +flush global status; flush status; select a, b , exists (select * from t2 where b=d) as SUBSE, b in (select d from t2) as SUBSI, (select d from t2 where b=c) SUBSR from t1; show status like "subquery_cache%"; show status like '%Handler_read%'; --echo #several subqueries (several levels) set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select a, b, (select exists (select * from t2 where b=d) from t2 where b=c) as SUNS1 from t1; show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; -flush status; +flush global status; flush status; select a, b, (select exists (select * from t2 where b=d) from t2 where b=c) as SUNS1 from t1; show status like "subquery_cache%"; show status like '%Handler_read%'; @@ -425,7 +425,7 @@ DROP TABLE t1; --echo #uncacheable queries test (random and side effect) --disable_ps2_protocol -flush status; +flush global status; flush status; CREATE TABLE t1 (a int); INSERT INTO t1 VALUES (2), (4), (1), (3); select a, a in (select a from t1) from t1 as ext; @@ -464,25 +464,25 @@ insert into t2 values (1,1),(3,3),(20,20); --disable_ps2_protocol --echo aggregate function as parameter of subquery set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select max(a), (select max(a) from t2 where max(a)=c) from t1 group by b; show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; -flush status; +flush global status; flush status; select max(a), (select max(a) from t2 where max(a)=c) from t1 group by b; show status like "subquery_cache%"; show status like '%Handler_read%'; --echo argument of aggregate function as parameter of subquery (illegal use) set optimizer_switch='subquery_cache=off'; -flush status; +flush global status; flush status; select max(a), (select a from t2 where a=c) from t1 group by b; show status like "subquery_cache%"; show status like '%Handler_read%'; set optimizer_switch='subquery_cache=on'; -flush status; +flush global status; flush status; select max(a), (select a from t2 where a=c) from t1 group by b; show status like "subquery_cache%"; show status like '%Handler_read%'; @@ -503,7 +503,7 @@ insert into t2 select a,a from t0; --disable_ps2_protocol set optimizer_switch='default,semijoin=on,materialization=on,subquery_cache=on'; -flush status; +flush global status; flush status; select * from t1 where a in (select pk from t2); show status like "subquery_cache%"; show status like '%Handler_read%'; @@ -512,7 +512,7 @@ alter table t2 drop primary key; set optimizer_switch='default,semijoin=off,materialization=off,subquery_cache=off'; explain select * from t1 where a in (select pk from t2); -flush status; +flush global status; flush status; select * from t1 where a in (select pk from t2); show status like "subquery_cache%"; show status like '%Handler_read%'; @@ -520,7 +520,7 @@ show status like '%Handler_read%'; set optimizer_switch='default,semijoin=off,materialization=off,subquery_cache=on'; explain select * from t1 where a in (select pk from t2); -flush status; +flush global status; flush status; select * from t1 where a in (select pk from t2); show status like "subquery_cache%"; show status like '%Handler_read%'; @@ -529,7 +529,7 @@ show status like '%Handler_read%'; set optimizer_switch='default,semijoin=off,materialization=on,subquery_cache=on'; explain select * from t1 where a in (select pk from t2); -flush status; +flush global status; flush status; select * from t1 where a in (select pk from t2); show status like "subquery_cache%"; show status like '%Handler_read%'; diff --git a/mysql-test/main/subselect_no_exists_to_in.result b/mysql-test/main/subselect_no_exists_to_in.result index d04b05e77a7..ea44b162cd8 100644 --- a/mysql-test/main/subselect_no_exists_to_in.result +++ b/mysql-test/main/subselect_no_exists_to_in.result @@ -7009,6 +7009,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m @@ -7051,6 +7052,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m diff --git a/mysql-test/main/subselect_no_mat.result b/mysql-test/main/subselect_no_mat.result index 70d1a01224b..5f58069a75c 100644 --- a/mysql-test/main/subselect_no_mat.result +++ b/mysql-test/main/subselect_no_mat.result @@ -7005,6 +7005,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m @@ -7047,6 +7048,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m diff --git a/mysql-test/main/subselect_no_opts.result b/mysql-test/main/subselect_no_opts.result index 77d0d73756a..887432b1292 100644 --- a/mysql-test/main/subselect_no_opts.result +++ b/mysql-test/main/subselect_no_opts.result @@ -7002,6 +7002,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m @@ -7044,6 +7045,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m diff --git a/mysql-test/main/subselect_no_scache.result b/mysql-test/main/subselect_no_scache.result index 8103c1ec5e0..d4b3917aeb5 100644 --- a/mysql-test/main/subselect_no_scache.result +++ b/mysql-test/main/subselect_no_scache.result @@ -7013,6 +7013,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m @@ -7055,6 +7056,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m diff --git a/mysql-test/main/subselect_no_semijoin.result b/mysql-test/main/subselect_no_semijoin.result index 308b0fa31d9..ba8c94afa67 100644 --- a/mysql-test/main/subselect_no_semijoin.result +++ b/mysql-test/main/subselect_no_semijoin.result @@ -7002,6 +7002,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m @@ -7044,6 +7045,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) 3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 flush status; +flush global status; SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) AS m diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index 04049fbe65b..7ded584d160 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -2201,7 +2201,11 @@ create table t1 (s1 int); create view abc as select * from t1 as abc; drop table t1; drop view abc; +# +# Bug#12993 View column rename broken in subselect +# flush status; +flush global status; create table t1(f1 char(1)); create view v1 as select * from t1; select * from (select f1 as f2, f1 as f3 from v1) v where v.f2='a'; diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index ddcaa296dd6..b89516d1299 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -2040,12 +2040,12 @@ create view abc as select * from t1 as abc; drop table t1; drop view abc; - -# -# Bug#12993 View column rename broken in subselect -# +--echo # +--echo # Bug#12993 View column rename broken in subselect +--echo # flush status; +flush global status; create table t1(f1 char(1)); create view v1 as select * from t1; select * from (select f1 as f2, f1 as f3 from v1) v where v.f2='a'; diff --git a/mysql-test/suite/binlog/include/binlog.test b/mysql-test/suite/binlog/include/binlog.test index 9f3288b52f0..a92a9957c53 100644 --- a/mysql-test/suite/binlog/include/binlog.test +++ b/mysql-test/suite/binlog/include/binlog.test @@ -87,7 +87,7 @@ reset master; create table t1 (a int, b char(255)) engine=innodb; -flush status; +flush global status; show status like "binlog_cache_use"; let $1=100; diff --git a/mysql-test/suite/binlog/include/binlog_cache_stat.test b/mysql-test/suite/binlog/include/binlog_cache_stat.test index c6287a6bad1..fcc029aa2b7 100644 --- a/mysql-test/suite/binlog/include/binlog_cache_stat.test +++ b/mysql-test/suite/binlog/include/binlog_cache_stat.test @@ -25,7 +25,7 @@ set @@global.binlog_cache_size=32768; --echo **** Preparing the enviroment to check commit and its effect on status variables. --echo **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. --echo **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; let $exp_cache= 0; let $got_cache= query_get_value(show status like "binlog_cache_use", Value, 1); let $exp_disk= 0; @@ -142,7 +142,7 @@ if (`SELECT $got_cache <> $exp_cache || $got_disk <> $exp_disk || $got_stmt_cach --echo **** Preparing the enviroment to check abort and its effect on the status variables. --echo **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. --echo **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; let $exp_cache= 0; let $got_cache= query_get_value(show status like "binlog_cache_use", Value, 1); let $exp_disk= 0; diff --git a/mysql-test/suite/binlog/r/binlog_gtid_index.result b/mysql-test/suite/binlog/r/binlog_gtid_index.result index e53e1aac8e3..13a91cbe9a5 100644 --- a/mysql-test/suite/binlog/r/binlog_gtid_index.result +++ b/mysql-test/suite/binlog/r/binlog_gtid_index.result @@ -55,7 +55,7 @@ INSERT INTO t1 VALUES (303); SET @gtid_pos= @@GLOBAL.gtid_binlog_pos; INSERT INTO t1 VALUES (304); INSERT INTO t1 VALUES (305); -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; +++ Initial status: SHOW STATUS LIKE 'binlog_gtid_index_%'; Variable_name Value diff --git a/mysql-test/suite/binlog/r/binlog_innodb.result b/mysql-test/suite/binlog/r/binlog_innodb.result index 233dda00075..4d908e13d1e 100644 --- a/mysql-test/suite/binlog/r/binlog_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_innodb.result @@ -121,7 +121,7 @@ master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Update_rows_v1 # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ DROP TABLE t1; -flush status; +flush global status; show status like "binlog_cache_use"; Variable_name Value Binlog_cache_use 0 diff --git a/mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result b/mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result index 6e2df0c55cd..fac21627cf0 100644 --- a/mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result +++ b/mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result @@ -8,7 +8,7 @@ set @@global.binlog_cache_size=32768; **** Preparing the enviroment to check commit and its effect on status variables. **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; **** Transactional changes which are long enough so they will be flushed to disk... **** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. @@ -37,7 +37,7 @@ commit; **** Preparing the enviroment to check abort and its effect on the status variables. **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; **** Transactional changes which are long enough so they will be flushed to disk... **** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result index 4e0afb7c369..b8b8d924c18 100644 --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result @@ -373,7 +373,7 @@ set @bcs = @@binlog_cache_size; set global binlog_cache_size=4096; reset master; create table t1 (a int, b char(255)) engine=innodb; -flush status; +flush global status; show status like "binlog_cache_use"; Variable_name Value Binlog_cache_use 0 @@ -385,7 +385,7 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; create table t1 (a int, b char(255)) engine=innodb master-bin.000001 # Gtid # # GTID #-#-# -master-bin.000001 # Query # # use `test`; flush status +master-bin.000001 # Query # # use `test`; flush global status master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Annotate_rows # # insert into t1 values( 100, 'just to fill void to make transaction occupying at least two buffers of the trans cache' ) master-bin.000001 # Table_map # # table_id: # (test.t1) diff --git a/mysql-test/suite/binlog/r/binlog_row_cache_stat.result b/mysql-test/suite/binlog/r/binlog_row_cache_stat.result index 6e2df0c55cd..fac21627cf0 100644 --- a/mysql-test/suite/binlog/r/binlog_row_cache_stat.result +++ b/mysql-test/suite/binlog/r/binlog_row_cache_stat.result @@ -8,7 +8,7 @@ set @@global.binlog_cache_size=32768; **** Preparing the enviroment to check commit and its effect on status variables. **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; **** Transactional changes which are long enough so they will be flushed to disk... **** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. @@ -37,7 +37,7 @@ commit; **** Preparing the enviroment to check abort and its effect on the status variables. **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; **** Transactional changes which are long enough so they will be flushed to disk... **** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result index a889e88b764..b47c80b7d04 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result @@ -176,7 +176,7 @@ set @bcs = @@binlog_cache_size; set global binlog_cache_size=4096; reset master; create table t1 (a int, b char(255)) engine=innodb; -flush status; +flush global status; show status like "binlog_cache_use"; Variable_name Value Binlog_cache_use 0 @@ -188,7 +188,7 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; create table t1 (a int, b char(255)) engine=innodb master-bin.000001 # Gtid # # GTID #-#-# -master-bin.000001 # Query # # use `test`; flush status +master-bin.000001 # Query # # use `test`; flush global status master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Query # # use `test`; insert into t1 values( 100, 'just to fill void to make transaction occupying at least two buffers of the trans cache' ) master-bin.000001 # Query # # use `test`; insert into t1 values( 99, 'just to fill void to make transaction occupying at least two buffers of the trans cache' ) diff --git a/mysql-test/suite/binlog/r/binlog_stm_cache_stat.result b/mysql-test/suite/binlog/r/binlog_stm_cache_stat.result index 6e2df0c55cd..fac21627cf0 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_cache_stat.result +++ b/mysql-test/suite/binlog/r/binlog_stm_cache_stat.result @@ -8,7 +8,7 @@ set @@global.binlog_cache_size=32768; **** Preparing the enviroment to check commit and its effect on status variables. **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; **** Transactional changes which are long enough so they will be flushed to disk... **** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. @@ -37,7 +37,7 @@ commit; **** Preparing the enviroment to check abort and its effect on the status variables. **** Expected: binlog_cache_use = 0, binlog_cache_disk_use = 0. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. -flush status; +flush global status; **** Transactional changes which are long enough so they will be flushed to disk... **** Expected: binlog_cache_use = 1, binlog_cache_disk_use = 1. **** Expected: binlog_stmt_cache_use = 0, binlog_stmt_cache_disk_use = 0. diff --git a/mysql-test/suite/binlog/r/mysqladmin.result b/mysql-test/suite/binlog/r/mysqladmin.result index 4be6c96d55b..c79df24b411 100644 --- a/mysql-test/suite/binlog/r/mysqladmin.result +++ b/mysql-test/suite/binlog/r/mysqladmin.result @@ -4,9 +4,9 @@ reset master; include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# -master-bin.000001 # Query # # flush status +master-bin.000001 # Query # # flush /*!110500 global */ status include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# -master-bin.000001 # Query # # flush status +master-bin.000001 # Query # # flush /*!110500 global */ status drop user adm@localhost; diff --git a/mysql-test/suite/binlog/t/binlog_gtid_index.test b/mysql-test/suite/binlog/t/binlog_gtid_index.test index 458b77ec9a7..3009ed2a38b 100644 --- a/mysql-test/suite/binlog/t/binlog_gtid_index.test +++ b/mysql-test/suite/binlog/t/binlog_gtid_index.test @@ -87,7 +87,7 @@ INSERT INTO t1 VALUES (305); # BINLOG_GTID_POS() has a side effect: it increments binlog_gtid_index_hit --disable_ps2_protocol -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; --echo +++ Initial status: SHOW STATUS LIKE 'binlog_gtid_index_%'; --echo +++ GTID Lookup in good index. diff --git a/mysql-test/suite/binlog/t/binlog_innodb.test b/mysql-test/suite/binlog/t/binlog_innodb.test index 5f372e6d5fd..ce3569728c2 100644 --- a/mysql-test/suite/binlog/t/binlog_innodb.test +++ b/mysql-test/suite/binlog/t/binlog_innodb.test @@ -101,7 +101,7 @@ DROP TABLE t1; # Actually this test has nothing to do with innodb per se, it just requires # transactional table. # -flush status; +flush global status; show status like "binlog_cache_use"; show status like "binlog_cache_disk_use"; diff --git a/mysql-test/suite/binlog_encryption/rpl_semi_sync.result b/mysql-test/suite/binlog_encryption/rpl_semi_sync.result index 03e3443b31e..7b127784d74 100644 --- a/mysql-test/suite/binlog_encryption/rpl_semi_sync.result +++ b/mysql-test/suite/binlog_encryption/rpl_semi_sync.result @@ -261,7 +261,7 @@ Rpl_semi_sync_master_no_tx 12 SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx'; Variable_name Value Rpl_semi_sync_master_yes_tx 15 -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; [ Semi-sync master status variables after FLUSH STATUS ] SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx'; Variable_name Value diff --git a/mysql-test/suite/galera/r/galera_query_cache.result b/mysql-test/suite/galera/r/galera_query_cache.result index 8f5bc4b6f37..557f21944d5 100644 --- a/mysql-test/suite/galera/r/galera_query_cache.result +++ b/mysql-test/suite/galera/r/galera_query_cache.result @@ -4,7 +4,7 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); connection node_2; RESET QUERY CACHE; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT COUNT(*) FROM t1; COUNT(*) 1 @@ -20,7 +20,7 @@ VARIABLE_VALUE = 1 connection node_1; INSERT INTO t1 VALUES (2); connection node_2; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT VARIABLE_VALUE = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Qcache_queries_in_cache'; VARIABLE_VALUE = 0 1 @@ -42,7 +42,7 @@ VARIABLE_VALUE = 1 connection node_1; ALTER TABLE t1 ADD COLUMN f2 INTEGER; connection node_2; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT VARIABLE_VALUE = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Qcache_queries_in_cache'; VARIABLE_VALUE = 0 1 diff --git a/mysql-test/suite/galera/t/galera_query_cache.test b/mysql-test/suite/galera/t/galera_query_cache.test index ec7306e0188..85f988a493b 100644 --- a/mysql-test/suite/galera/t/galera_query_cache.test +++ b/mysql-test/suite/galera/t/galera_query_cache.test @@ -17,7 +17,7 @@ INSERT INTO t1 VALUES (1); --connection node_2 RESET QUERY CACHE; -FLUSH STATUS; +FLUSH GLOBAL STATUS; # # 1. Cache works @@ -37,7 +37,7 @@ SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_ INSERT INTO t1 VALUES (2); --connection node_2 -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT VARIABLE_VALUE = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Qcache_queries_in_cache'; SELECT COUNT(*) FROM t1; @@ -55,7 +55,7 @@ SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_ ALTER TABLE t1 ADD COLUMN f2 INTEGER; --connection node_2 -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT VARIABLE_VALUE = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Qcache_queries_in_cache'; SELECT COUNT(*) FROM t1; diff --git a/mysql-test/suite/perfschema/include/connection_setup.inc b/mysql-test/suite/perfschema/include/connection_setup.inc index 93b8e959ee3..7df87439d2b 100644 --- a/mysql-test/suite/perfschema/include/connection_setup.inc +++ b/mysql-test/suite/perfschema/include/connection_setup.inc @@ -75,7 +75,7 @@ truncate table performance_schema.hosts; # Start from a known clean state, to avoid noise from previous tests flush tables; -flush status; +flush global status; --disable_warnings drop procedure if exists dump_all; diff --git a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc index 03f88e97eef..8a7725546eb 100644 --- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc @@ -145,7 +145,7 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES' # Start from a known clean state, to avoid noise from previous tests flush tables; -flush status; +flush global status; truncate performance_schema.events_waits_summary_by_thread_by_event_name; truncate performance_schema.events_waits_summary_by_account_by_event_name; truncate performance_schema.events_waits_summary_by_user_by_event_name; diff --git a/mysql-test/suite/perfschema/include/hostcache_set_state.inc b/mysql-test/suite/perfschema/include/hostcache_set_state.inc index 995a1028a4b..6db6f4429d4 100644 --- a/mysql-test/suite/perfschema/include/hostcache_set_state.inc +++ b/mysql-test/suite/perfschema/include/hostcache_set_state.inc @@ -2,7 +2,7 @@ # Set a known initial state for the test -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc b/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc index 1272c0921e7..b9ce35c7647 100644 --- a/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc @@ -106,7 +106,7 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES' # Start from a known clean state, to avoid noise from previous tests flush tables; -flush status; +flush global status; truncate performance_schema.memory_summary_by_thread_by_event_name; truncate performance_schema.memory_summary_by_account_by_event_name; truncate performance_schema.memory_summary_by_user_by_event_name; diff --git a/mysql-test/suite/perfschema/include/stage_setup.inc b/mysql-test/suite/perfschema/include/stage_setup.inc index ba97d9094a9..4fbd59d7242 100644 --- a/mysql-test/suite/perfschema/include/stage_setup.inc +++ b/mysql-test/suite/perfschema/include/stage_setup.inc @@ -69,7 +69,7 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'; # Start from a known clean state, to avoid noise from previous tests flush tables; -flush status; +flush global status; truncate performance_schema.events_stages_summary_by_thread_by_event_name; truncate performance_schema.events_stages_summary_global_by_event_name; truncate performance_schema.events_stages_history; diff --git a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc index 79f7bd70a3f..56689027d2a 100644 --- a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc +++ b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc @@ -133,7 +133,7 @@ update performance_schema.setup_consumers set enabled='YES'; # Start from a known clean state, to avoid noise from previous tests flush tables; -flush status; +flush global status; create table test.t1(a int, b int, c int, d int default 0, primary key(a), diff --git a/mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc b/mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc index 02957903762..e6f4ab442d0 100644 --- a/mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc +++ b/mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc @@ -4,7 +4,7 @@ update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/include/table_io_result_helper.inc b/mysql-test/suite/perfschema/include/table_io_result_helper.inc index 66431b6a8c6..d3d6b360078 100644 --- a/mysql-test/suite/perfschema/include/table_io_result_helper.inc +++ b/mysql-test/suite/perfschema/include/table_io_result_helper.inc @@ -18,5 +18,5 @@ show global status like 'performance_schema_%'; # Cleanup truncate performance_schema.events_waits_history_long; -flush status; +flush global status; diff --git a/mysql-test/suite/perfschema/include/table_io_setup_helper.inc b/mysql-test/suite/perfschema/include/table_io_setup_helper.inc index b4c4b5fab69..66b6cde7de2 100644 --- a/mysql-test/suite/perfschema/include/table_io_setup_helper.inc +++ b/mysql-test/suite/perfschema/include/table_io_setup_helper.inc @@ -47,7 +47,7 @@ update performance_schema.setup_instruments set enabled='YES' truncate table performance_schema.events_waits_history_long; # Reset lost counters to a known state -flush status; +flush global status; # Make sure there is room to instrument tables from this test. flush tables; diff --git a/mysql-test/suite/perfschema/r/csv_table_io.result b/mysql-test/suite/perfschema/r/csv_table_io.result index 3d32f452e6b..883dcd88615 100644 --- a/mysql-test/suite/perfschema/r/csv_table_io.result +++ b/mysql-test/suite/perfschema/r/csv_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop table if exists test.no_index_tab; update performance_schema.setup_consumers set enabled='YES'; @@ -136,10 +136,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result index 880e00367d0..1f1f553b12f 100644 --- a/mysql-test/suite/perfschema/r/func_file_io.result +++ b/mysql-test/suite/perfschema/r/func_file_io.result @@ -4,7 +4,7 @@ WHERE name LIKE 'wait/io/file/%'; update performance_schema.threads SET instrumented = 'YES' WHERE PROCESSLIST_ID=connection_id(); truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value') ENGINE=MyISAM; diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result index b5c5e33f2c6..025bc5aec7f 100644 --- a/mysql-test/suite/perfschema/r/func_mutex.result +++ b/mysql-test/suite/perfschema/r/func_mutex.result @@ -3,7 +3,7 @@ UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name LIKE 'wait/synch/mutex/%' OR name LIKE 'wait/synch/rwlock/%'; truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; select NAME from performance_schema.mutex_instances where NAME = 'wait/synch/mutex/mysys/THR_LOCK::mutex' GROUP BY NAME; NAME diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result index d84d6a72239..d528287c483 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result index 10861f5e352..daeea5cbd55 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result index 8e87d0dc50e..ae641416834 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result index 3b39b09d3e1..7833e90fef8 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result index d14a73a8f46..89022fbe83b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result index 5cd714fba4f..6182efbbc5d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result index c52da0dc578..d364a8b088c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result index b889df4e451..1648cacd36c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv4.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result index 6e3d928509c..dc4dce4e139 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result @@ -1,5 +1,5 @@ install soname 'auth_ed25519'; -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result index 31ffb4065b9..b2e1509ccd0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result index 6be60f0a070..130749a84e1 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result index 42030ed8ac0..87a9745e605 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result index 2ea779fd351..50d65536f5c 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result index 60852eb2021..a4347883366 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result index c453bc35cd5..088609d185d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result index 1b07f4fcd16..56c3d86b7f2 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result index 63baa481d09..482244bb45b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result index 8d69d9c4d9a..ded371dd28d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result index 33f3528b8b3..2e853dbb743 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result index 2b0f4ff7da6..ad857ad6c55 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result index 12b27c8ecb5..cb10c044c7e 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result index 5d8d7fd3f63..4e13c3c903f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result index c46ea3dc342..fe5d9c7438b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result index 786f1b8a6c8..bbf4bd453f9 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("192.0.2.4"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result index 8dfcdac1b44..4c51a7496a0 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result index f2aa7fe02a2..488314b475d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result index 2fda71b3c38..42ddde23fff 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("santa.claus.ipv6.example.com"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result index 09b965f443b..ee8cf0edf9f 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result index 4cef13e028d..a3addea2254 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result index c109fe8cff0..85789ccbbb5 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result index f9c1f736365..c2122fac72b 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("2001:db8::6:6"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result index 675694d1fb9..d53f787a0e1 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("2001:db8::6:6"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result index b8ae214fd7a..7ba30966d47 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result @@ -1,5 +1,5 @@ call mtr.add_suppression("2001:db8::6:6"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result index b5f098a6a1f..9d8d9141077 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result @@ -1,5 +1,5 @@ call mtr.add_suppression("2001:db8::6:6"); -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result index a6f04e0c6b6..2e103ac2ea4 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result index 90c8d9cce39..c046c9f9ef6 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; diff --git a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result index 6aad20ec488..a403132e87d 100644 --- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result +++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result @@ -1,4 +1,4 @@ -flush status; +flush global status; flush hosts; flush user_resources; flush privileges; @@ -52,7 +52,7 @@ Connection_errors_select 0 Connection_errors_tcpwrap 0 # Dumping performance_schema.host_cache SET @@GLOBAL.debug_dbug = @saved_dbug; -flush status; +flush global status; show global status like "connection_errors_%"; Variable_name Value Connection_errors_accept 0 diff --git a/mysql-test/suite/perfschema/r/indexed_table_io.result b/mysql-test/suite/perfschema/r/indexed_table_io.result index 0f1d219c77e..7d7754e0167 100644 --- a/mysql-test/suite/perfschema/r/indexed_table_io.result +++ b/mysql-test/suite/perfschema/r/indexed_table_io.result @@ -7,7 +7,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; create table test.no_index_tab ( a int, b char(30) default 'Default') engine = MyISAM; @@ -161,6 +161,6 @@ drop table test.index_tab; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/innodb_table_io.result b/mysql-test/suite/perfschema/r/innodb_table_io.result index 2d178d9ee33..aa590e28873 100644 --- a/mysql-test/suite/perfschema/r/innodb_table_io.result +++ b/mysql-test/suite/perfschema/r/innodb_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop table if exists test.no_index_tab; update performance_schema.setup_consumers set enabled='YES'; @@ -137,10 +137,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/mdl_func.result b/mysql-test/suite/perfschema/r/mdl_func.result index f3fc0d10a96..e359f48d2ea 100644 --- a/mysql-test/suite/perfschema/r/mdl_func.result +++ b/mysql-test/suite/perfschema/r/mdl_func.result @@ -77,7 +77,7 @@ prepare dump_waits_history_long from from performance_schema.events_waits_history_long where event_name = \'wait/lock/metadata/sql/mdl\';"; truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; flush tables; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value'); diff --git a/mysql-test/suite/perfschema/r/memory_table_io.result b/mysql-test/suite/perfschema/r/memory_table_io.result index e8aa98ce61f..231a3688c23 100644 --- a/mysql-test/suite/perfschema/r/memory_table_io.result +++ b/mysql-test/suite/perfschema/r/memory_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop table if exists test.no_index_tab; update performance_schema.setup_consumers set enabled='YES'; @@ -136,10 +136,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/merge_table_io.result b/mysql-test/suite/perfschema/r/merge_table_io.result index f2bdfd2c55a..fd222f04e65 100644 --- a/mysql-test/suite/perfschema/r/merge_table_io.result +++ b/mysql-test/suite/perfschema/r/merge_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop table if exists test.no_index_tab; drop table if exists test.no_index_tab_1; @@ -168,10 +168,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/misc_global_status.result b/mysql-test/suite/perfschema/r/misc_global_status.result index 1863dde6103..b4851d4fd80 100644 --- a/mysql-test/suite/perfschema/r/misc_global_status.result +++ b/mysql-test/suite/perfschema/r/misc_global_status.result @@ -9,7 +9,7 @@ FLUSH PRIVILEGES; CREATE TABLE test.t_range(a int, b int, PRIMARY KEY(a)); INSERT INTO test.t_range values (1, 1), (2,2), (3, 3), (4, 4), (5, 5); INSERT INTO test.t_range values (6, 6), (7,7), (8, 8), (9, 9), (10, 10); -FLUSH STATUS; +FLUSH GLOBAL STATUS; SELECT * from test.t_range where (a >= 3) AND (a <= 5); a b 3 3 diff --git a/mysql-test/suite/perfschema/r/multi_table_io.result b/mysql-test/suite/perfschema/r/multi_table_io.result index 29df241e53d..8db8564a353 100644 --- a/mysql-test/suite/perfschema/r/multi_table_io.result +++ b/mysql-test/suite/perfschema/r/multi_table_io.result @@ -23,7 +23,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; update performance_schema.setup_consumers set enabled = 'YES'; insert into test1.t2 select * from test.t1; @@ -105,12 +105,12 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; drop table test.t1; drop schema test1; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result index ec03a16e8a1..cd38ca5d363 100644 --- a/mysql-test/suite/perfschema/r/myisam_file_io.result +++ b/mysql-test/suite/perfschema/r/myisam_file_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_consumers set enabled='YES'; truncate table performance_schema.events_waits_history_long; truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; drop table if exists test.no_index_tab; create table test.no_index_tab ( a varchar(255), b int ) engine=myisam; insert into no_index_tab set a = 'foo', b = 1; diff --git a/mysql-test/suite/perfschema/r/myisam_table_io.result b/mysql-test/suite/perfschema/r/myisam_table_io.result index 574bd47e2ba..918ed6a617f 100644 --- a/mysql-test/suite/perfschema/r/myisam_table_io.result +++ b/mysql-test/suite/perfschema/r/myisam_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop table if exists test.no_index_tab; update performance_schema.setup_consumers set enabled='YES'; @@ -136,10 +136,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result index de47b49dbab..3d3fcf2de65 100644 --- a/mysql-test/suite/perfschema/r/ortho_iter.result +++ b/mysql-test/suite/perfschema/r/ortho_iter.result @@ -1,6 +1,6 @@ drop procedure if exists check_instrument; truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; create procedure check_instrument(in instr_name varchar(128)) begin declare save_count_expected integer; diff --git a/mysql-test/suite/perfschema/r/part_table_io.result b/mysql-test/suite/perfschema/r/part_table_io.result index 2c6040c8313..780d010de9e 100644 --- a/mysql-test/suite/perfschema/r/part_table_io.result +++ b/mysql-test/suite/perfschema/r/part_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop table if exists test.no_index_tab; update performance_schema.setup_consumers set enabled='YES'; @@ -138,10 +138,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result index 9e5e0ad31cc..c8ffb15a3b5 100644 --- a/mysql-test/suite/perfschema/r/privilege_table_io.result +++ b/mysql-test/suite/perfschema/r/privilege_table_io.result @@ -6,7 +6,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; # We are forced to suppress here the server response. optimize table mysql.user; @@ -167,11 +167,11 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; update performance_schema.setup_objects set enabled='NO' diff --git a/mysql-test/suite/perfschema/r/query_cache.result b/mysql-test/suite/perfschema/r/query_cache.result index 41d7d483634..036b8f24d11 100644 --- a/mysql-test/suite/perfschema/r/query_cache.result +++ b/mysql-test/suite/perfschema/r/query_cache.result @@ -5,7 +5,7 @@ insert into t1 values (1), (2), (3); SET GLOBAL query_cache_size=1355776; flush query cache; reset query cache; -flush status; +flush global status; select * from t1; a 1 @@ -70,4 +70,4 @@ Variable_name Value Qcache_hits 1 SET GLOBAL query_cache_size=@save_query_cache_size; drop table t1; -flush status; +flush global status; diff --git a/mysql-test/suite/perfschema/r/rollback_table_io.result b/mysql-test/suite/perfschema/r/rollback_table_io.result index e4805731d40..20c900dab5d 100644 --- a/mysql-test/suite/perfschema/r/rollback_table_io.result +++ b/mysql-test/suite/perfschema/r/rollback_table_io.result @@ -15,7 +15,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; update performance_schema.setup_consumers set enabled = 'YES'; set autocommit = off; @@ -87,11 +87,11 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; drop table test.t1; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/show_aggregate.result b/mysql-test/suite/perfschema/r/show_aggregate.result index 3facb3c5f04..c382cbe1059 100644 --- a/mysql-test/suite/perfschema/r/show_aggregate.result +++ b/mysql-test/suite/perfschema/r/show_aggregate.result @@ -7,7 +7,7 @@ SET @@session.sql_log_bin=OFF; # CREATE 3 CLIENTS, 3 CONNECTIONS, RESULTS TABLE connection default; USE test; -flush status; +flush global status; # # Create results table CREATE TABLE test.status_results @@ -492,10 +492,10 @@ variable_name h1 h2 h3 delta host Expected Handler_delete 6 0 0 6 6 OKp Handler_rollback 6 0 0 6 6 OKp # ================================================================================ -# TEST 8: FLUSH STATUS should clear account, host and user status +# TEST 8: FLUSH GLOBAL STATUS should clear account, host and user status # ================================================================================ # -FLUSH STATUS; +FLUSH GLOBAL STATUS; # SELECT * FROM status_by_account WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete'); USER HOST VARIABLE_NAME VARIABLE_VALUE diff --git a/mysql-test/suite/perfschema/r/start_server_low_index.result b/mysql-test/suite/perfschema/r/start_server_low_index.result index da7bf4adec6..d5303ad5580 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_index.result +++ b/mysql-test/suite/perfschema/r/start_server_low_index.result @@ -188,7 +188,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; variable_value > 0 1 -FLUSH STATUS; +FLUSH GLOBAL STATUS; select variable_value from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; variable_value @@ -239,7 +239,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; variable_value > 0 1 -FLUSH STATUS; +FLUSH GLOBAL STATUS; update performance_schema.setup_objects set ENABLED='NO' where OBJECT_TYPE='TABLE'; insert into db1.t1 values('5', 'abc'); insert into db1.t1 values('6', 'abc'); diff --git a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result index 820b30de4b5..a80cbdf7668 100644 --- a/mysql-test/suite/perfschema/r/start_server_low_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result @@ -205,7 +205,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST'; variable_value > 0 1 -flush status; +flush global status; update performance_schema.setup_objects set ENABLED='NO' where OBJECT_TYPE='TABLE' and OBJECT_SCHEMA="%"; insert into db1.t1 values('5', 'abc'); diff --git a/mysql-test/suite/perfschema/r/start_server_no_index.result b/mysql-test/suite/perfschema/r/start_server_no_index.result index 6574a8c60f8..7163390d09e 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_index.result +++ b/mysql-test/suite/perfschema/r/start_server_no_index.result @@ -178,7 +178,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; variable_value > 0 1 -FLUSH STATUS; +FLUSH GLOBAL STATUS; select variable_value from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; variable_value diff --git a/mysql-test/suite/perfschema/r/start_server_no_mdl.result b/mysql-test/suite/perfschema/r/start_server_no_mdl.result index 1bfbc0d1b29..e8774137e45 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_mdl.result +++ b/mysql-test/suite/perfschema/r/start_server_no_mdl.result @@ -155,7 +155,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_METADATA_LOCK_LOST'; variable_value > 0 1 -FLUSH STATUS; +FLUSH GLOBAL STATUS; select variable_value from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_METADATA_LOCK_LOST'; variable_value diff --git a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result index 8ce0396c6d3..9fe84d34ba6 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result +++ b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result @@ -206,7 +206,7 @@ DROP TABLE t1; show global status like "%performance_schema_prepared_statements_lost%"; Variable_name Value Performance_schema_prepared_statements_lost 4 -flush status; +flush global status; show global status like "%performance_schema_prepared_statements_lost%"; Variable_name Value Performance_schema_prepared_statements_lost 0 diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result index bc87ec4fa24..16eb6c1ae12 100644 --- a/mysql-test/suite/perfschema/r/start_server_no_table_lock.result +++ b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result @@ -170,7 +170,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST'; variable_value > 0 1 -FLUSH STATUS; +FLUSH GLOBAL STATUS; select variable_value from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST'; variable_value diff --git a/mysql-test/suite/perfschema/r/temp_table_io.result b/mysql-test/suite/perfschema/r/temp_table_io.result index e6e9d6a696c..93a523822ed 100644 --- a/mysql-test/suite/perfschema/r/temp_table_io.result +++ b/mysql-test/suite/perfschema/r/temp_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop temporary table if exists test.no_index_tab; update performance_schema.setup_consumers set enabled = 'YES'; @@ -117,10 +117,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/thread_cache.result b/mysql-test/suite/perfschema/r/thread_cache.result index 8c39f4ddca5..2663b0e5e6a 100644 --- a/mysql-test/suite/perfschema/r/thread_cache.result +++ b/mysql-test/suite/perfschema/r/thread_cache.result @@ -1,4 +1,4 @@ -flush status; +flush global status; SET @saved_thread_cache_size = @@global.thread_cache_size; set global thread_cache_size = 0; show global variables like "thread_cache_size"; diff --git a/mysql-test/suite/perfschema/r/trigger_table_io.result b/mysql-test/suite/perfschema/r/trigger_table_io.result index 02821a481af..77c7db530db 100644 --- a/mysql-test/suite/perfschema/r/trigger_table_io.result +++ b/mysql-test/suite/perfschema/r/trigger_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop table if exists test.t1; drop table if exists test.t2; @@ -190,12 +190,12 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; drop table test.t1; drop table test.t2; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/r/view_table_io.result b/mysql-test/suite/perfschema/r/view_table_io.result index ec8af31800b..09761ab3a6d 100644 --- a/mysql-test/suite/perfschema/r/view_table_io.result +++ b/mysql-test/suite/perfschema/r/view_table_io.result @@ -5,7 +5,7 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES' where name like "wait/io/table/%"; truncate table performance_schema.events_waits_history_long; -flush status; +flush global status; flush tables; drop view if exists test.v1; drop table if exists test.no_index_tab; @@ -145,10 +145,10 @@ Performance_schema_thread_classes_lost 0 Performance_schema_thread_instances_lost 0 Performance_schema_users_lost 0 truncate performance_schema.events_waits_history_long; -flush status; +flush global status; update performance_schema.setup_consumers set enabled='NO'; truncate performance_schema.events_waits_history_long; drop table test.marker; -flush status; +flush global status; update performance_schema.setup_instruments set enabled='YES'; update performance_schema.setup_consumers set enabled='YES'; diff --git a/mysql-test/suite/perfschema/t/func_file_io.test b/mysql-test/suite/perfschema/t/func_file_io.test index e29b05b81ff..675956dca84 100644 --- a/mysql-test/suite/perfschema/t/func_file_io.test +++ b/mysql-test/suite/perfschema/t/func_file_io.test @@ -17,7 +17,7 @@ update performance_schema.threads SET instrumented = 'YES' # reset lost counters truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test index 1964852134d..48a24eb3b19 100644 --- a/mysql-test/suite/perfschema/t/func_mutex.test +++ b/mysql-test/suite/perfschema/t/func_mutex.test @@ -15,7 +15,7 @@ WHERE name LIKE 'wait/synch/mutex/%' # reset lost counters truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; # Make sure objects are instrumented select NAME from performance_schema.mutex_instances diff --git a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test index 827421312dc..e80390b42cd 100644 --- a/mysql-test/suite/perfschema/t/hostcache_peer_addr.test +++ b/mysql-test/suite/perfschema/t/hostcache_peer_addr.test @@ -45,6 +45,6 @@ show global status like "connection_errors_%"; SET @@GLOBAL.debug_dbug = @saved_dbug; -flush status; +flush global status; show global status like "connection_errors_%"; diff --git a/mysql-test/suite/perfschema/t/mdl_func.test b/mysql-test/suite/perfschema/t/mdl_func.test index 209c2f112af..75ae3614005 100644 --- a/mysql-test/suite/perfschema/t/mdl_func.test +++ b/mysql-test/suite/perfschema/t/mdl_func.test @@ -109,7 +109,7 @@ prepare dump_waits_history_long from # reset lost counters truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; flush tables; diff --git a/mysql-test/suite/perfschema/t/misc_global_status.test b/mysql-test/suite/perfschema/t/misc_global_status.test index c9ae14c1993..ee9a9f9c78e 100644 --- a/mysql-test/suite/perfschema/t/misc_global_status.test +++ b/mysql-test/suite/perfschema/t/misc_global_status.test @@ -24,7 +24,7 @@ CREATE TABLE test.t_range(a int, b int, PRIMARY KEY(a)); INSERT INTO test.t_range values (1, 1), (2,2), (3, 3), (4, 4), (5, 5); INSERT INTO test.t_range values (6, 6), (7,7), (8, 8), (9, 9), (10, 10); -FLUSH STATUS; +FLUSH GLOBAL STATUS; let $initial= `SELECT VARIABLE_VALUE FROM performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range'`; diff --git a/mysql-test/suite/perfschema/t/myisam_file_io.test b/mysql-test/suite/perfschema/t/myisam_file_io.test index 96f24d8a835..13db78752ba 100644 --- a/mysql-test/suite/perfschema/t/myisam_file_io.test +++ b/mysql-test/suite/perfschema/t/myisam_file_io.test @@ -16,7 +16,7 @@ truncate table performance_schema.events_waits_history_long; # Reset lost counters to a known state truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; # Code to test diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test index ee1581c284b..30cd244c11a 100644 --- a/mysql-test/suite/perfschema/t/nesting.test +++ b/mysql-test/suite/perfschema/t/nesting.test @@ -60,7 +60,7 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES' # Start from a known clean state, to avoid noise from previous tests truncate table performance_schema.events_statements_summary_by_digest; flush tables; -flush status; +flush global status; truncate performance_schema.events_waits_current; truncate performance_schema.events_waits_history; diff --git a/mysql-test/suite/perfschema/t/ortho_iter.test b/mysql-test/suite/perfschema/t/ortho_iter.test index 531437158b1..1895f80f22b 100644 --- a/mysql-test/suite/perfschema/t/ortho_iter.test +++ b/mysql-test/suite/perfschema/t/ortho_iter.test @@ -12,7 +12,7 @@ drop procedure if exists check_instrument; # reset counters truncate table performance_schema.events_statements_summary_by_digest; -flush status; +flush global status; # Print known global memory instruments (PSI_FLAG_GLOBAL), # see maintenance of count_global_expected below. diff --git a/mysql-test/suite/perfschema/t/query_cache.test b/mysql-test/suite/perfschema/t/query_cache.test index 045c4628e9e..7e412fdb545 100644 --- a/mysql-test/suite/perfschema/t/query_cache.test +++ b/mysql-test/suite/perfschema/t/query_cache.test @@ -20,7 +20,7 @@ SET GLOBAL query_cache_size=1355776; flush query cache; reset query cache; -flush status; +flush global status; --disable_ps2_protocol select * from t1; @@ -57,5 +57,5 @@ show global status like "Qcache_hits"; SET GLOBAL query_cache_size=@save_query_cache_size; drop table t1; -flush status; +flush global status; diff --git a/mysql-test/suite/perfschema/t/show_aggregate.test b/mysql-test/suite/perfschema/t/show_aggregate.test index c84e99f6efc..7b67516d002 100644 --- a/mysql-test/suite/perfschema/t/show_aggregate.test +++ b/mysql-test/suite/perfschema/t/show_aggregate.test @@ -25,7 +25,7 @@ SET @@session.sql_log_bin=OFF; connection default; USE test; -flush status; +flush global status; --echo # --echo # Create results table @@ -277,10 +277,10 @@ FROM test.status_results ORDER BY variable_name; --echo # ================================================================================ ---echo # TEST 8: FLUSH STATUS should clear account, host and user status +--echo # TEST 8: FLUSH GLOBAL STATUS should clear account, host and user status --echo # ================================================================================ --echo # -FLUSH STATUS; +FLUSH GLOBAL STATUS; --echo # SELECT * FROM status_by_account WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete'); --echo # diff --git a/mysql-test/suite/perfschema/t/show_coverage.test b/mysql-test/suite/perfschema/t/show_coverage.test index 6a8d90d6058..6357c99a6f3 100644 --- a/mysql-test/suite/perfschema/t/show_coverage.test +++ b/mysql-test/suite/perfschema/t/show_coverage.test @@ -93,7 +93,7 @@ SELECT variable_value FROM status_by_thread WHERE variable_name = "bytes_received" and thread_id = @thread_id INTO @bytes_before; --echo # --echo # Reset status counters -FLUSH STATUS; +FLUSH GLOBAL STATUS; --echo # --echo # Record bytes_received after reset SELECT variable_value FROM status_by_thread @@ -170,7 +170,7 @@ SET long_query_time = @@global.long_query_time; --source include/assert.inc --echo # -FLUSH STATUS; +FLUSH GLOBAL STATUS; --echo # ## Global value requested from the default session after FLUSH must remain the same diff --git a/mysql-test/suite/perfschema/t/show_misc.test b/mysql-test/suite/perfschema/t/show_misc.test index e557ef31e94..3ce8edb74e2 100644 --- a/mysql-test/suite/perfschema/t/show_misc.test +++ b/mysql-test/suite/perfschema/t/show_misc.test @@ -8,6 +8,7 @@ select 2; SHOW STATUS LIKE 'Last_query_cost'; flush status; +flush global status; SHOW STATUS LIKE 'Created_tmp_tables'; --echo # diff --git a/mysql-test/suite/perfschema/t/start_server_low_index.test b/mysql-test/suite/perfschema/t/start_server_low_index.test index eea01091baa..8c4387518d0 100644 --- a/mysql-test/suite/perfschema/t/start_server_low_index.test +++ b/mysql-test/suite/perfschema/t/start_server_low_index.test @@ -67,7 +67,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; # While at it, check that FLUSH STATUS Resets the lost counter -FLUSH STATUS; +FLUSH GLOBAL STATUS; select variable_value from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; @@ -124,7 +124,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; ##################################################################################### diff --git a/mysql-test/suite/perfschema/t/start_server_low_table_lock.test b/mysql-test/suite/perfschema/t/start_server_low_table_lock.test index d397b16e0e0..89c1f211eb0 100644 --- a/mysql-test/suite/perfschema/t/start_server_low_table_lock.test +++ b/mysql-test/suite/perfschema/t/start_server_low_table_lock.test @@ -86,8 +86,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST'; --enable_warnings -flush status; - +flush global status; ####################################### # Update setup_objects to DISABLE TABLE diff --git a/mysql-test/suite/perfschema/t/start_server_no_index.test b/mysql-test/suite/perfschema/t/start_server_no_index.test index 6f8f27b2464..823ebedb209 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_index.test +++ b/mysql-test/suite/perfschema/t/start_server_no_index.test @@ -53,8 +53,8 @@ select COUNT_STAR from performance_schema.table_io_waits_summary_by_index_usage select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; -# While at it, check that FLUSH STATUS Resets the lost counter -FLUSH STATUS; +# While at it, check that FLUSH GLOBAL STATUS Resets the lost counter +FLUSH GLOBAL STATUS; select variable_value from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST'; diff --git a/mysql-test/suite/perfschema/t/start_server_no_mdl.test b/mysql-test/suite/perfschema/t/start_server_no_mdl.test index c3d1ca7d791..234c1d75649 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_mdl.test +++ b/mysql-test/suite/perfschema/t/start_server_no_mdl.test @@ -14,7 +14,7 @@ select variable_value > 0 from information_schema.global_status --enable_warnings # While at it, check that flush status resets the lost counter -FLUSH STATUS; +FLUSH GLOBAL STATUS; --disable_warnings select variable_value from information_schema.global_status diff --git a/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances.test b/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances.test index 840b3afdbf3..24bb57e9aa3 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances.test +++ b/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances.test @@ -35,7 +35,7 @@ show global status like "%performance_schema_prepared_statements_lost%"; show global status like "%performance_schema_prepared_statements_lost%"; # Flush status now -flush status; +flush global status; # status after flush. expect 0. show global status like "%performance_schema_prepared_statements_lost%"; diff --git a/mysql-test/suite/perfschema/t/start_server_no_table_lock.test b/mysql-test/suite/perfschema/t/start_server_no_table_lock.test index 111130b74e7..79c77c1580b 100644 --- a/mysql-test/suite/perfschema/t/start_server_no_table_lock.test +++ b/mysql-test/suite/perfschema/t/start_server_no_table_lock.test @@ -44,7 +44,7 @@ select variable_value > 0 from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST'; # While at it, check that FLUSH STATUS Resets the lost counter -FLUSH STATUS; +FLUSH GLOBAL STATUS; select variable_value from information_schema.global_status where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST'; diff --git a/mysql-test/suite/perfschema/t/thread_cache.test b/mysql-test/suite/perfschema/t/thread_cache.test index 92309bb9ca1..a6adaec75f1 100644 --- a/mysql-test/suite/perfschema/t/thread_cache.test +++ b/mysql-test/suite/perfschema/t/thread_cache.test @@ -11,7 +11,7 @@ # Setup -flush status; +flush global status; SET @saved_thread_cache_size = @@global.thread_cache_size; diff --git a/mysql-test/suite/plugins/r/show_all_plugins.result b/mysql-test/suite/plugins/r/show_all_plugins.result index ebd5b6cc198..9fdc9a39882 100644 --- a/mysql-test/suite/plugins/r/show_all_plugins.result +++ b/mysql-test/suite/plugins/r/show_all_plugins.result @@ -1,4 +1,4 @@ -flush status; +flush global status; show status like '%libraries%'; Variable_name Value Opened_plugin_libraries 0 diff --git a/mysql-test/suite/plugins/t/show_all_plugins.test b/mysql-test/suite/plugins/t/show_all_plugins.test index 171bcc93bbd..9225d55b691 100644 --- a/mysql-test/suite/plugins/t/show_all_plugins.test +++ b/mysql-test/suite/plugins/t/show_all_plugins.test @@ -5,7 +5,7 @@ if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; } if (!$EXAMPLE_KEY_MANAGEMENT_SO) { skip requires example_key_management.so; } if (`SELECT VERSION() LIKE '%embedded%'`) { skip Disabled for embedded until MDEV-8664 is resolved; } -flush status; +flush global status; show status like '%libraries%'; #--sorted_result #select * from information_schema.all_plugins; diff --git a/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_loaddata.result b/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_loaddata.result index a876a597aea..681d6a3d152 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_loaddata.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_loaddata.result @@ -5,7 +5,7 @@ SET @save_binlog_stmt_cache_size= @@GLOBAL.binlog_stmt_cache_size; SET GLOBAL binlog_stmt_cache_size= 4096; CALL mtr.add_suppression('"No space left on device".*An incident event is written to binary log'); CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=MyISAM; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SHOW STATUS LIKE "binlog_stmt_cache%"; Variable_name Value Binlog_stmt_cache_disk_use 0 diff --git a/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_row.result b/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_row.result index 753fdaa4e6b..dc49157189f 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_row.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_row.result @@ -5,7 +5,7 @@ SET @save_binlog_stmt_cache_size= @@GLOBAL.binlog_stmt_cache_size; SET GLOBAL binlog_stmt_cache_size= 4096; CALL mtr.add_suppression('"No space left on device".*An incident event is written to binary log'); CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(255)) ENGINE=MyISAM; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SHOW STATUS LIKE "binlog_stmt_cache%"; Variable_name Value Binlog_stmt_cache_disk_use 0 diff --git a/mysql-test/suite/rpl/r/rpl_checksum_cache.result b/mysql-test/suite/rpl/r/rpl_checksum_cache.result index b908c546ce3..875a7067d37 100644 --- a/mysql-test/suite/rpl/r/rpl_checksum_cache.result +++ b/mysql-test/suite/rpl/r/rpl_checksum_cache.result @@ -13,7 +13,7 @@ connection slave; include/stop_slave.inc include/start_slave.inc connection master; -flush status; +flush global status; show status like "binlog_cache_use"; Variable_name Value Binlog_cache_use 0 @@ -49,7 +49,7 @@ delete from t1; commit; connection slave; connection master; -flush status; +flush global status; create table t2(a int auto_increment primary key, data VARCHAR(12288)) ENGINE=Innodb; show status like "binlog_cache_use"; Variable_name Value @@ -66,7 +66,7 @@ delete from t2; commit; connection slave; connection master; -flush status; +flush global status; create table t3(a int auto_increment primary key, data VARCHAR(8192)) engine=innodb; show status like "binlog_cache_use"; Variable_name Value @@ -83,7 +83,7 @@ delete from t3; commit; connection slave; connection master; -flush status; +flush global status; create procedure test.p1 (n int) begin while n > 0 do diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync.result b/mysql-test/suite/rpl/r/rpl_semi_sync.result index 03e3443b31e..7b127784d74 100644 --- a/mysql-test/suite/rpl/r/rpl_semi_sync.result +++ b/mysql-test/suite/rpl/r/rpl_semi_sync.result @@ -261,7 +261,7 @@ Rpl_semi_sync_master_no_tx 12 SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx'; Variable_name Value Rpl_semi_sync_master_yes_tx 15 -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; [ Semi-sync master status variables after FLUSH STATUS ] SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx'; Variable_name Value diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result index a79b372f937..a09baea97bc 100644 --- a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result +++ b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result @@ -262,7 +262,7 @@ Rpl_semi_sync_master_no_tx 12 SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx'; Variable_name Value Rpl_semi_sync_master_yes_tx 17 -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; [ Semi-sync master status variables after FLUSH STATUS ] SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx'; Variable_name Value diff --git a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result index 393c9c55a0d..7b7380b96c4 100644 --- a/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result +++ b/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result @@ -262,7 +262,7 @@ Rpl_semi_sync_master_no_tx 12 SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx'; Variable_name Value Rpl_semi_sync_master_yes_tx 15 -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; [ Semi-sync master status variables after FLUSH STATUS ] SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx'; Variable_name Value diff --git a/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_loaddata.test b/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_loaddata.test index 50a67532501..114df0c3a95 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_loaddata.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_loaddata.test @@ -10,7 +10,7 @@ SET GLOBAL binlog_stmt_cache_size= 4096; CALL mtr.add_suppression('"No space left on device".*An incident event is written to binary log'); CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=MyISAM; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SHOW STATUS LIKE "binlog_stmt_cache%"; SET @old_dbug= @@SESSION.debug_dbug; SET SESSION debug_dbug="+d,load_data_binlog_cache_error"; diff --git a/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row.test b/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row.test index 2c5813bb53e..839677a0536 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row.test @@ -10,7 +10,7 @@ SET GLOBAL binlog_stmt_cache_size= 4096; CALL mtr.add_suppression('"No space left on device".*An incident event is written to binary log'); CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(255)) ENGINE=MyISAM; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SHOW STATUS LIKE "binlog_stmt_cache%"; INSERT INTO t1 VALUES (0, CONCAT("?", "-", REPEAT("x", 200))); INSERT INTO t1 SELECT a+1, CONCAT(a, "-", REPEAT("x", 200)) FROM t1; diff --git a/mysql-test/suite/rpl/t/rpl_checksum_cache.test b/mysql-test/suite/rpl/t/rpl_checksum_cache.test index 173af8c1d0b..762006eb6c4 100644 --- a/mysql-test/suite/rpl/t/rpl_checksum_cache.test +++ b/mysql-test/suite/rpl/t/rpl_checksum_cache.test @@ -44,7 +44,7 @@ connection master; # 1. the event size is much less than the cache's buffer # -flush status; +flush global status; show status like "binlog_cache_use"; show status like "binlog_cache_disk_use"; --disable_warnings @@ -108,7 +108,7 @@ sync_slave_with_master; # connection master; -flush status; +flush global status; let $t2_data_size= `select 3 * @@global.binlog_cache_size`; let $t2_aver_size= `select 2 * @@global.binlog_cache_size`; let $t2_max_rand= `select 1 * @@global.binlog_cache_size`; @@ -150,7 +150,7 @@ sync_slave_with_master; connection master; -flush status; +flush global status; let $t3_data_size= `select 2 * @@global.binlog_cache_size`; let $t3_aver_size= `select (9 * @@global.binlog_cache_size) / 10`; let $t3_max_rand= `select (2 * @@global.binlog_cache_size) / 10`; @@ -192,7 +192,7 @@ sync_slave_with_master; # connection master; -flush status; +flush global status; delimiter |; eval create procedure test.p1 (n int) diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test index ff2336151a0..0c2ebc67288 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test @@ -313,7 +313,7 @@ SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx'; SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx'; # Do not write the FLUSH STATUS to binlog, to make sure we'll get a # clean status after this. -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; echo [ Semi-sync master status variables after FLUSH STATUS ]; SHOW STATUS LIKE 'Rpl_semi_sync_master_no_tx'; SHOW STATUS LIKE 'Rpl_semi_sync_master_yes_tx'; diff --git a/mysql-test/suite/sql_sequence/replication.result b/mysql-test/suite/sql_sequence/replication.result index 94b1c72b9e0..f7e46b74f98 100644 --- a/mysql-test/suite/sql_sequence/replication.result +++ b/mysql-test/suite/sql_sequence/replication.result @@ -263,7 +263,7 @@ drop sequence s_db.s1; query cache test ########################################### connection master; -flush status; +flush global status; show global variables like 'query_cache_type'; Variable_name Value query_cache_type ON diff --git a/mysql-test/suite/sql_sequence/replication.test b/mysql-test/suite/sql_sequence/replication.test index 827cda560d2..38c405a454f 100644 --- a/mysql-test/suite/sql_sequence/replication.test +++ b/mysql-test/suite/sql_sequence/replication.test @@ -262,7 +262,7 @@ drop sequence s_db.s1; --echo query cache test --echo ########################################### connection master; -flush status; +flush global status; show global variables like 'query_cache_type'; show status like 'Qcache_hits'; diff --git a/mysql-test/suite/sys_vars/r/delay_key_write_func.result b/mysql-test/suite/sys_vars/r/delay_key_write_func.result index 5cc4b2eaaad..4a244c5679a 100644 --- a/mysql-test/suite/sys_vars/r/delay_key_write_func.result +++ b/mysql-test/suite/sys_vars/r/delay_key_write_func.result @@ -15,7 +15,7 @@ a INT PRIMARY KEY, b VARCHAR(512), c DOUBLE ) DELAY_KEY_WRITE = 1; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; Variable_name Value @@ -37,7 +37,7 @@ a INT PRIMARY KEY, b VARCHAR(512), c DOUBLE ) DELAY_KEY_WRITE = 1; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; Variable_name Value @@ -59,7 +59,7 @@ a INT PRIMARY KEY, b VARCHAR(512), c DOUBLE ) DELAY_KEY_WRITE = 0; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; Variable_name Value diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_func.result b/mysql-test/suite/sys_vars/r/query_cache_limit_func.result index 8dde5c3603b..ff808adcce9 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_limit_func.result +++ b/mysql-test/suite/sys_vars/r/query_cache_limit_func.result @@ -19,7 +19,7 @@ INSERT INTO t set c = concat(repeat('x',28),'r','x'); INSERT INTO t set c = concat(repeat('x',28),'s','y'); INSERT INTO t set c = concat(repeat('x',28),'g','w'); ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; ** On query_cache_type ** SET GLOBAL query_cache_type = ON; @@ -31,7 +31,7 @@ SET GLOBAL query_cache_size = 131072; SET GLOBAL query_cache_type = ON; '#---------------------FN_DYNVARS_132_01----------------------#' ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; ** fetching results ** SELECT * FROM t; @@ -49,7 +49,7 @@ Variable_name Value Qcache_queries_in_cache 1 '#---------------------FN_DYNVARS_132_02----------------------#' ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; ** set cache limit ** SET @@GLOBAL.query_cache_limit = 0; @@ -73,7 +73,7 @@ Qcache_queries_in_cache 0 ** set cache limit ** SET @@GLOBAL.query_cache_limit = DEFAULT; ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; ** fetching results ** SELECT * FROM t; diff --git a/mysql-test/suite/sys_vars/t/delay_key_write_func.test b/mysql-test/suite/sys_vars/t/delay_key_write_func.test index e823e51954c..cccab874a52 100644 --- a/mysql-test/suite/sys_vars/t/delay_key_write_func.test +++ b/mysql-test/suite/sys_vars/t/delay_key_write_func.test @@ -51,7 +51,7 @@ b VARCHAR(512), c DOUBLE ) DELAY_KEY_WRITE = 1; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CALL sp_addRecords(1,10); @@ -74,7 +74,7 @@ b VARCHAR(512), c DOUBLE ) DELAY_KEY_WRITE = 1; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; @@ -95,7 +95,7 @@ b VARCHAR(512), c DOUBLE ) DELAY_KEY_WRITE = 0; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CALL sp_addRecords(1,10); SHOW STATUS LIKE 'Key_reads'; diff --git a/mysql-test/suite/sys_vars/t/query_cache_limit_func.test b/mysql-test/suite/sys_vars/t/query_cache_limit_func.test index e0105c89866..105b594abbc 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_limit_func.test +++ b/mysql-test/suite/sys_vars/t/query_cache_limit_func.test @@ -60,7 +60,7 @@ INSERT INTO t set c = concat(repeat('x',28),'g','w'); # Reset cache & flush status --echo ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; # set query cache type value to on and allocating cache size @@ -83,7 +83,7 @@ SET GLOBAL query_cache_type = ON; # Reset cache & flush status --echo ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; @@ -105,7 +105,7 @@ SHOW STATUS LIKE 'Qcache_queries_in_cache'; # Reset cache & flush status --echo ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; #set cache limit @@ -137,7 +137,7 @@ SET @@GLOBAL.query_cache_limit = DEFAULT; # Reset cache & flush status --echo ** Reset cache values ** -FLUSH STATUS; +FLUSH GLOBAL STATUS; RESET QUERY CACHE; #fetching results# diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c index 093600786fa..b086fc6bd4b 100644 --- a/mysys/my_getsystime.c +++ b/mysys/my_getsystime.c @@ -101,7 +101,7 @@ my_hrtime_t my_hrtime() Has lower latency than my_hrtime(). Used in situations, where microsecond precision is not needed, e.g in Windows pthread_cond_timedwait, where POSIX interface needs nanoseconds, yet the underlying Windows function only - accepts millisecons. + accepts milliseconds. */ my_hrtime_t my_hrtime_coarse() { diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5bc3e087e0e..8d4b4ff853c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -596,7 +596,7 @@ const double log_10[] = { 1e300, 1e301, 1e302, 1e303, 1e304, 1e305, 1e306, 1e307, 1e308 }; -time_t server_start_time, flush_status_time; +time_t server_start_time; char mysql_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30]; char *default_tz_name; @@ -3860,7 +3860,7 @@ static int init_common_variables() } max_system_variables.pseudo_thread_id= ~(my_thread_id) 0; - server_start_time= flush_status_time= my_time(0); + server_start_time= global_status_var.flush_status_time= my_time(0); my_disable_copystat_in_redel= 1; global_rpl_filter= new Rpl_filter; @@ -6899,16 +6899,21 @@ static int show_starttime(THD *thd, SHOW_VAR *var, void *buff, return 0; } -#ifdef ENABLED_PROFILING static int show_flushstatustime(THD *thd, SHOW_VAR *var, void *buff, - system_status_var *, enum_var_type) + system_status_var *status_var, + enum_var_type type) { + if (type == SHOW_OPT_GLOBAL) + { + /* For global status, global_status_var.flush_status_time is up to date */ + status_var= &global_status_var; + } + var->type= SHOW_LONG; var->value= buff; - *((long *)buff)= (long) (thd->query_start() - flush_status_time); + *((long *)buff)= (long) (thd->query_start() - status_var->flush_status_time); return 0; } -#endif #ifdef HAVE_REPLICATION static int show_rpl_status(THD *, SHOW_VAR *var, void *, system_status_var *, @@ -7633,9 +7638,7 @@ SHOW_VAR status_vars[]= { {"Transactions_gtid_foreign_engine", (char*) &transactions_gtid_foreign_engine, SHOW_LONG}, {"Update_scan", (char*) offsetof(STATUS_VAR, update_scan_count), SHOW_LONG_STATUS}, {"Uptime", (char*) &show_starttime, SHOW_SIMPLE_FUNC}, -#ifdef ENABLED_PROFILING {"Uptime_since_flush_status",(char*) &show_flushstatustime, SHOW_SIMPLE_FUNC}, -#endif #ifdef WITH_WSREP {"wsrep_connected", (char*) &wsrep_connected, SHOW_BOOL}, {"wsrep_ready", (char*) &wsrep_show_ready, SHOW_FUNC}, @@ -9158,27 +9161,43 @@ static void delete_pid_file(myf flags) } -/** Clear most status variables. */ -void refresh_status(THD *thd) +/** Clear session (connection) status variables */ + +void refresh_session_status(THD *thd) { + /* Add thread's status variables to global status */ mysql_mutex_lock(&LOCK_status); - -#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE - /* Reset aggregated status counters. */ - reset_pfs_status_stats(); -#endif - - /* Add thread's status variabels to global status */ add_to_status(&global_status_var, &thd->status_var); + mysql_mutex_unlock(&LOCK_status); /* Reset thread's status variables */ thd->set_status_var_init(); thd->status_var.global_memory_used= 0; bzero((uchar*) &thd->org_status_var, sizeof(thd->org_status_var)); thd->start_bytes_received= 0; +} - /* Reset some global variables */ + +/* + Refresh (reset) global status variables +*/ + +void refresh_global_status() +{ + mysql_mutex_lock(&LOCK_status); + + /* + Reset variables of type SHOW_LONG and SHOW_LONGLONG registered in + 'all_status_vars' (includes all variables in 'status_vars[]) + */ reset_status_vars(); + /* + Reset accoumulated thread's status variables. + These are the variables in 'status_vars[]' with the prefix _STATUS. + */ + bzero((char*) &global_status_var, offsetof(STATUS_VAR, + last_cleared_system_status_var)); + #ifdef WITH_WSREP if (WSREP_ON) { @@ -9186,11 +9205,20 @@ void refresh_status(THD *thd) } #endif /* WITH_WSREP */ +#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE + /* Reset aggregated status counters. */ + reset_pfs_status_stats(); +#endif + /* Reset the counters of all key caches (default and named). */ process_key_caches(reset_key_cache_counters, 0); - flush_status_time= time((time_t*) 0); + global_status_var.flush_status_time= my_time(0); mysql_mutex_unlock(&LOCK_status); +#ifdef HAVE_REPLICATION + repl_semisync_master.reset_stats(); +#endif + /* Set max_used_connections to the number of currently open connections. This is not perfect, but status data is not exact anyway. @@ -9199,6 +9227,7 @@ void refresh_status(THD *thd) max_used_connections_time= time(nullptr); } + #ifdef HAVE_PSI_INTERFACE static PSI_file_info all_server_files[]= { diff --git a/sql/mysqld.h b/sql/mysqld.h index 9432e953ea6..f9de1c2f6f0 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -80,7 +80,8 @@ void close_connection(THD *thd, uint sql_errno= 0); void handle_connection_in_main_thread(CONNECT *thd); void create_thread_to_handle_connection(CONNECT *connect); void unlink_thd(THD *thd); -void refresh_status(THD *thd); +void refresh_session_status(THD *thd); +void refresh_global_status(); bool is_secure_file_path(char *path); extern void init_net_server_extension(THD *thd); extern void handle_accepted_socket(MYSQL_SOCKET new_sock, MYSQL_SOCKET sock); @@ -275,7 +276,7 @@ extern ulong executed_events; extern char language[FN_REFLEN]; extern "C" MYSQL_PLUGIN_IMPORT ulong server_id; extern ulong concurrency; -extern time_t server_start_time, flush_status_time; +extern time_t server_start_time; extern char *opt_mysql_tmpdir, mysql_charsets_dir[]; extern size_t mysql_unpacked_real_data_home_len; extern MYSQL_PLUGIN_IMPORT MY_TMPDIR mysql_tmpdir_list; diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc index fdf2cf21cf1..e81bcd5b9be 100644 --- a/sql/semisync_master.cc +++ b/sql/semisync_master.cc @@ -1420,6 +1420,22 @@ void Repl_semi_sync_master::set_export_stats() unlock(); } +void Repl_semi_sync_master::reset_stats() +{ + lock(); + rpl_semi_sync_master_yes_transactions = 0; + rpl_semi_sync_master_no_transactions = 0; + rpl_semi_sync_master_off_times = 0; + rpl_semi_sync_master_timefunc_fails = 0; + rpl_semi_sync_master_wait_sessions = 0; + rpl_semi_sync_master_wait_pos_backtraverse = 0; + rpl_semi_sync_master_trx_wait_num = 0; + rpl_semi_sync_master_trx_wait_time = 0; + rpl_semi_sync_master_net_wait_num = 0; + rpl_semi_sync_master_net_wait_time = 0; + unlock(); +} + void Repl_semi_sync_master::await_all_slave_replies(const char *msg) { struct timespec timeout; diff --git a/sql/semisync_master.h b/sql/semisync_master.h index 3978d21a61d..80ad4f80730 100644 --- a/sql/semisync_master.h +++ b/sql/semisync_master.h @@ -689,6 +689,7 @@ class Repl_semi_sync_master /* Export internal statistics for semi-sync replication. */ void set_export_stats(); + void reset_stats(); /* 'reset master' command is issued from the user and semi-sync need to * go off for that. diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 34d5210b7f3..0ff9f3730f5 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1710,6 +1710,7 @@ void THD::reset_for_reuse() m_command= COM_CONNECT; proc_info= "login"; // Same as in THD::THD() transaction->on= 1; + status_var.flush_status_time= my_time(0); #if defined(ENABLED_PROFILING) profiling.reset(); #endif @@ -4560,6 +4561,7 @@ void THD::set_status_var_init() STATUS. And at this point thread is guaranteed to be running. */ status_var.threads_running= 1; + status_var.flush_status_time= my_time(0); } diff --git a/sql/sql_class.h b/sql/sql_class.h index f9e39c4977c..670115f5021 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1064,6 +1064,7 @@ typedef struct system_status_var volatile int64 local_memory_used; /* Memory allocated for global usage */ volatile int64 global_memory_used; + time_t flush_status_time; } STATUS_VAR; /* diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 467d9b2083a..47dc3ad5001 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2183,7 +2183,8 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD * if (trans_commit_implicit(thd)) break; thd->release_transactional_locks(); - if (check_global_access(thd,RELOAD_ACL)) + if ((options & ~REFRESH_SESSION_STATUS) && + check_global_access(thd,RELOAD_ACL)) break; general_log_print(thd, command, NullS); #ifndef DBUG_OFF @@ -5237,7 +5238,8 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) case SQLCOM_FLUSH: { int write_to_binlog; - if (check_global_access(thd,RELOAD_ACL)) + if ((lex->type & ~REFRESH_SESSION_STATUS) && + check_global_access(thd,RELOAD_ACL)) goto error; if (first_table && lex->type & (REFRESH_READ_LOCK|REFRESH_FOR_EXPORT)) @@ -5275,7 +5277,8 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) #ifdef HAVE_QUERY_CACHE REFRESH_QUERY_CACHE_FREE | #endif /* HAVE_QUERY_CACHE */ - REFRESH_STATUS | + REFRESH_SESSION_STATUS | + REFRESH_GLOBAL_STATUS | REFRESH_USER_RESOURCES)) { WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL); diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 0c0b863edf3..1caeac86122 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -379,8 +379,10 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options, #endif if (options & REFRESH_HOSTS) hostname_cache_refresh(); - if (thd && (options & REFRESH_STATUS)) - refresh_status(thd); + if (thd && (options & REFRESH_SESSION_STATUS)) + refresh_session_status(thd); + if ((options & REFRESH_GLOBAL_STATUS)) + refresh_global_status(); if (options & REFRESH_THREADS) thread_cache.flush(); #ifdef HAVE_REPLICATION diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 9e78dbad7f1..bbdd4eafb4d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -14673,7 +14673,11 @@ flush_option: Lex->relay_log_connection_name= empty_clex_str; } | STATUS_SYM - { Lex->type|= REFRESH_STATUS; } + { Lex->type|= REFRESH_SESSION_STATUS; } + | SESSION_SYM STATUS_SYM + { Lex->type|= REFRESH_SESSION_STATUS; } + | GLOBAL_SYM STATUS_SYM + { Lex->type|= REFRESH_GLOBAL_STATUS; } | SLAVE optional_connection_name { LEX *lex= Lex; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result index c09ec340ccb..f88ef67e7f7 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_multithread.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE diaries ( title TEXT, FULLTEXT INDEX ft(title) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_single_thread.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_single_thread.result index c09ec340ccb..f88ef67e7f7 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_single_thread.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_after_insert_single_thread.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE diaries ( title TEXT, FULLTEXT INDEX ft(title) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_disabled.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_disabled.result index 8d29e0425cf..e63275ee658 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_disabled.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_disabled.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_and.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_and.result index 26ca6de7b28..102c00f38f0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_and.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_and.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT, age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_between.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_between.result index c4b1dbf7141..0ebb5ecf4b2 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_between.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_between.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, INDEX (age) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_equal.result index 2bbcfe7549c..9a97b2c8506 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, INDEX (age) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_boolean_mode.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_boolean_mode.result index 6ec4d774b28..7e1c15eeada 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_boolean_mode.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_boolean_mode.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( content TEXT, FULLTEXT INDEX (content) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_natural_language_mode.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_natural_language_mode.result index 36a1958955a..1ef6586c10b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_natural_language_mode.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_full_text_search_in_natural_language_mode.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( content TEXT, FULLTEXT INDEX (content) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater.result index 4eba1922134..3af33dee8be 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, INDEX (age) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater_equal.result index 4de49651b81..5dcd4af5498 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_greater_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, INDEX (age) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less.result index a57a3b8fa6f..a1ff99e2253 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, INDEX (age) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less_equal.result index c770b63daf8..7799bafe15d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_less_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, INDEX (age) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result index 837ca2b6381..b5dbeb474c8 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_index_not_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, INDEX (age) diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_multiple_conditions.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_multiple_conditions.result index 39a0f0bd785..1be765f1a12 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_multiple_conditions.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_multiple_conditions.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT, age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_between.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_between.result index 26c8b6a9d94..e7bdcf3f92d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_between.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_between.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY ) DEFAULT CHARSET=UTF8; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_equal.result index 713a19dd184..8e8477c9778 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY ) DEFAULT CHARSET=UTF8; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater.result index fe9de9e631d..6399f6ce7ae 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY ) DEFAULT CHARSET=UTF8; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater_equal.result index 2fa5213ea49..18cd5b3d7c5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_greater_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY ) DEFAULT CHARSET=UTF8; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less.result index 05afd7e8d58..6f4592101fe 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY ) DEFAULT CHARSET=UTF8; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less_equal.result index 200f89d3eb6..12e84df01b9 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_less_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY ) DEFAULT CHARSET=UTF8; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result index 1b253a8edc6..92013581cfe 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_count_skip_primary_key_not_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS users; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY ) DEFAULT CHARSET=UTF8; diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_disabled.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_disabled.result index dcf0f3eec66..ae3b7d1c31f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_disabled.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_disabled.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_multiple_match_againsts.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_multiple_match_againsts.result index 124a7750f5b..2d3518d9601 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_multiple_match_againsts.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_multiple_match_againsts.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_no_limit.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_no_limit.result index 5a0ea86cc93..da073f2261b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_no_limit.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_not_optimized_no_limit.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_cp932.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_cp932.result index d58c3cf223a..d79025071ba 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_cp932.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_cp932.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES CP932; CREATE TABLE memos ( Ž¯•ÊŽq INT UNSIGNED, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between.result index f1cc14b4963..01f5bcfdd86 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between_over.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between_over.result index 0374f50030e..8a8ee9f5ca5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between_over.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_between_over.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_equal.result index 4bc3f9d5c73..6c01c98c18b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than.result index 56629777889..873ac853214 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than_or_equal.result index b03fe20f397..fe09e4809a7 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_greater_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than.result index c25f2a56e90..9b2d9dbf8c6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than_or_equal.result index ef93bf8b879..4e2d0884b8b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_datetime_less_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_duplicated_order_by_columns.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_duplicated_order_by_columns.result index 9ea8ea40093..447608ca00d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_duplicated_order_by_columns.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_duplicated_order_by_columns.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS ids; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES utf8mb4; CREATE TABLE ids ( id int PRIMARY KEY, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_name.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_name.result index f20089f0074..7f7d559db87 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_name.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_name.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES utf8; CREATE TABLE memos ( id int PRIMARY KEY, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_value.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_value.result index 88ec9dd81db..f058dbdb4b5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_value.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_enum_value.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES utf8; CREATE TABLE memos ( id int PRIMARY KEY, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_have_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_have_primary_key.result index 5c18e22d1af..8f4dabcc42c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_have_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_have_primary_key.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between.result index ed86c0e1e37..71ec536b49e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between_over.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between_over.result index a18e2a15863..d7afbd8cc46 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between_over.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_between_over.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_equal.result index 634fe89cdd4..7fd598e5bea 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than.result index 22305c7045a..813f903450b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than_or_equal.result index 439f453d184..07cc1bf89bf 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_greater_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than.result index 51ec2fde5e6..a9f10bf3457 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than_or_equal.result index 3c4f3973f84..7574fde7460 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_int_less_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_primary_key.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_primary_key.result index 03364eb1017..72d56510fff 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_primary_key.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_where_clause.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_where_clause.result index 9730069c849..16c6aa0015d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_where_clause.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_no_where_clause.result @@ -1,5 +1,5 @@ drop table if exists t1; -flush status; +flush global status; create table t1 (c1 int primary key, c2 int, c3 text, _id int, key idx1(c2), fulltext index ft(c3)) default charset utf8; insert into t1 values(1,10,"aa ii uu ee oo",null); insert into t1 values(2,20,"ka ki ku ke ko",null); diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_asc.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_asc.result index a284f4dd280..924f282f083 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_asc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_asc.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_desc.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_desc.result index 270d263966d..e6c13dcb038 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_desc.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_desc.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_id.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_id.result index eb19384eb63..64690f41d54 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_id.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_id.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( _id INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_match_against.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_match_against.result index 80bd895a6e4..0426d282018 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_match_against.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_order_by_match_against.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_select_match_against.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_select_match_against.result index b3ed4bf6b4d..44b52294604 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_select_match_against.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_select_match_against.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between.result index 793423f5bc5..ef055778d56 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between_over.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between_over.result index f50417d1f29..edd1ea41955 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between_over.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_between_over.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_equal.result index 26da350050f..480c99ffa05 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than.result index 342947cc77e..91118b120f1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than_or_equal.result index adc4ec6316e..a89e6eb2d13 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_greater_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than.result index 2881cc7724a..436178a5e9c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than_or_equal.result index d1a9fc2787a..3f0737c6280 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_time_less_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_with_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_with_index.result index bff0d993ef8..38d979cee55 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_with_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_with_index.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_without_index.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_without_index.result index cc3173ecff2..0240d1ca261 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_without_index.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_varchar_equal_without_index.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS diaries; -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( id INT UNSIGNED NOT NULL, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between.result index 5a1b1bda2ce..0a7d4fcf858 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS mroonga_releases; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, release_title TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between_over.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between_over.result index b0ad41fbbba..b46a27e6a82 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between_over.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_between_over.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS mroonga_releases; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, release_title TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_equal.result index 08db6b384e8..274e06fd940 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS mroonga_releases; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, release_title TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than.result index a33cd484865..c9a2931964b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS mroonga_releases; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, release_title TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than_or_equal.result index 7d2471b3aa0..b7e7619783b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_greater_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS mroonga_releases; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, release_title TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than.result index cac3d6f4356..c7194086f36 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS mroonga_releases; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, release_title TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than_or_equal.result b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than_or_equal.result index df57f51e5d6..ec07b0a6c22 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than_or_equal.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/optimization_order_limit_optimized_year_less_than_or_equal.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS mroonga_releases; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, release_title TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_multithread.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_multithread.test index 6078e908c7f..77386e11c98 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_multithread.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_multithread.test @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE diaries ( title TEXT, FULLTEXT INDEX ft(title) diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_single_thread.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_single_thread.test index c699c20e565..e60038324a0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_single_thread.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_after_insert_single_thread.test @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE diaries ( title TEXT, FULLTEXT INDEX ft(title) diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_disabled.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_disabled.test index c911694c1ba..4fabb570f76 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_disabled.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_disabled.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_and.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_and.test index 4881ae43f46..8fffd7eba06 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_and.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_and.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_between.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_between.test index 34c8bd0ae51..a6db7f262f5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_between.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_between.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_equal.test index dedf4543d76..4252b3fcaa0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_boolean_mode.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_boolean_mode.test index b99e9b7a3fb..1d25c78e937 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_boolean_mode.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_boolean_mode.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( content TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_natural_language_mode.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_natural_language_mode.test index e4cba0d2c43..cef560aeae1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_natural_language_mode.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_full_text_search_in_natural_language_mode.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( content TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater.test index 904bf0c534d..17d7bc81c80 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater_equal.test index 40571d7c234..eb533536705 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_greater_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less.test index ddfee173ccf..6682c6afd4d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less_equal.test index 0c5af3cdd52..d5e1f5d9a60 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_less_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test index ed696c71ea6..dc910267588 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_index_not_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( age INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_multiple_conditions.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_multiple_conditions.test index 07387cea956..f50bce945ff 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_multiple_conditions.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_multiple_conditions.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_between.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_between.test index 1aef072cb1b..d944ca5e920 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_between.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_between.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_equal.test index 24fe09a0402..619fab9c110 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater.test index be77d4c8bf6..5d46fad2c54 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater_equal.test index f82a322a623..4554bfc315b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_greater_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less.test index 741d1bca68d..20c0f1f68be 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less_equal.test index 248ace5678e..9f4f6e7cbc6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_less_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_not_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_not_equal.test index 277c4afacc5..eaa64026960 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_not_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_count_skip_primary_key_not_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS users; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE users ( id INT PRIMARY KEY diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_disabled.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_disabled.test index 79fb9ddf3f5..55657d09619 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_disabled.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_disabled.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_multiple_match_againsts.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_multiple_match_againsts.test index 6de18c57547..6986d5a755c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_multiple_match_againsts.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_multiple_match_againsts.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_no_limit.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_no_limit.test index 0e0fe6454ae..32eac27cd12 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_no_limit.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_not_optimized_no_limit.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_cp932.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_cp932.test index 9da4c7e30d2..deeb23041ea 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_cp932.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_cp932.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES CP932; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between.test index a6903197c52..0b635d5e5b0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between_over.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between_over.test index add0056dbee..b56b73035a5 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between_over.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_between_over.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_equal.test index 306a7bfb591..e1b6c010c09 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than.test index 5a07338662e..cfbace93c81 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than_or_equal.test index 997035c419b..d94c3d2b808 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_greater_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than.test index d3395d3fe9a..46308b51f1e 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than_or_equal.test index 37ec453d37d..49fa4238578 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_datetime_less_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_duplicated_order_by_columns.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_duplicated_order_by_columns.test index 7c8df7a9072..7a9a0c15195 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_duplicated_order_by_columns.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_duplicated_order_by_columns.test @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS ids; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES utf8mb4; diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_name.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_name.test index 36d2a40fb8b..1898eb35035 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_name.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_name.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES utf8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_value.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_value.test index 599d157d054..481a7bc5f9a 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_value.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_enum_value.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES utf8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_have_primary_key.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_have_primary_key.test index 94097ec99a3..8d10cd143ac 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_have_primary_key.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_have_primary_key.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between.test index 922d6edcfe0..4bec9900b61 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between_over.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between_over.test index afd60af4b99..f424a3fda07 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between_over.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_between_over.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_equal.test index 495dc1bb25c..0a43f7ea41c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than.test index 8c4167202b5..39c56cffdc0 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than_or_equal.test index 04674ee8477..4c469212144 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_greater_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than.test index 7917405a04b..e5bf38af484 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than_or_equal.test index 5da40dea8c4..1ffcf770b59 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_int_less_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_primary_key.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_primary_key.test index 69a13e226c9..54d85ca0a4d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_primary_key.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_primary_key.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_where_clause.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_where_clause.test index 2ccdc9db6e1..f9ffff36fa6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_where_clause.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_no_where_clause.test @@ -20,7 +20,7 @@ drop table if exists t1; --enable_warnings -flush status; +flush global status; create table t1 (c1 int primary key, c2 int, c3 text, _id int, key idx1(c2), fulltext index ft(c3)) default charset utf8; insert into t1 values(1,10,"aa ii uu ee oo",null); insert into t1 values(2,20,"ka ki ku ke ko",null); diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_asc.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_asc.test index 02037064163..908909868b1 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_asc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_asc.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_desc.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_desc.test index 51dad46b05a..66e431bed87 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_desc.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_desc.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_id.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_id.test index 0bb6a7fc366..3e8e724eafb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_id.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_id.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_match_against.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_match_against.test index 4f8d5cf6683..42194c3c42c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_match_against.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_order_by_match_against.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_select_match_against.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_select_match_against.test index 0b0476d6882..4fa2ba91eb9 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_select_match_against.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_select_match_against.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between.test index 56ba51a3f49..8b3097f6e98 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between_over.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between_over.test index dfb6d3161f9..42e26b33ff9 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between_over.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_between_over.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_equal.test index e1c1111fb31..7c88e044d5c 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than.test index fed76bc5486..e36c52e93de 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than_or_equal.test index 32fadbeedc6..9c7a0d272fd 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_greater_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than.test index 849726da6e6..ff7e5c8ca8b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than_or_equal.test index ecfc743437d..3227ded79d6 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_time_less_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE memos ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_with_index.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_with_index.test index 5fc4342efe4..7fa40cd828b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_with_index.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_with_index.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_without_index.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_without_index.test index 8536e559c29..24d15d13eab 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_without_index.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_varchar_equal_without_index.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS diaries; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; SET NAMES UTF8; CREATE TABLE diaries ( diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between.test index 4d2b8a52cd9..e8b65014054 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS mroonga_releases; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between_over.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between_over.test index 5b253483fc0..d458910275d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between_over.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_between_over.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS mroonga_releases; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_equal.test index bdb848dec06..202cd6e4a8f 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS mroonga_releases; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than.test index 9bc429fe563..2c08a29f6b4 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS mroonga_releases; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than_or_equal.test index 76c01606949..2dada1b985b 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_greater_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS mroonga_releases; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than.test index fb8130b5864..4d48314eca7 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS mroonga_releases; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, diff --git a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than_or_equal.test b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than_or_equal.test index 270dce85258..c1f53277c2d 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than_or_equal.test +++ b/storage/mroonga/mysql-test/mroonga/storage/t/optimization_order_limit_optimized_year_less_than_or_equal.test @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS mroonga_releases; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE mroonga_releases ( id INT PRIMARY KEY AUTO_INCREMENT, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_TODO_SPLIT_ME.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_TODO_SPLIT_ME.result index 660700602b7..631aa120455 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_TODO_SPLIT_ME.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_TODO_SPLIT_ME.result @@ -1,5 +1,5 @@ drop table if exists t1; -flush status; +flush global status; create table t1 ( c1 int primary key, c2 int, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_direction.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_direction.result index 9dd3e6eaa1b..e50e631a697 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_direction.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_direction.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( id int PRIMARY KEY, content TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_where_clause.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_where_clause.result index b31d2ee5360..e153486917e 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_where_clause.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_no_where_clause.result @@ -1,5 +1,5 @@ drop table if exists t1; -flush status; +flush global status; create table t1 ( c1 int primary key, c2 int, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_order_by_primary_key.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_order_by_primary_key.result index eb5e04fcc0c..0cdd1bd18aa 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_order_by_primary_key.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/optimization_order_limit_order_by_primary_key.result @@ -1,5 +1,5 @@ DROP TABLE IF EXISTS memos; -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( id int PRIMARY KEY, content TEXT, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_TODO_SPLIT_ME.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_TODO_SPLIT_ME.test index b00f1ea5169..82068a0ca13 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_TODO_SPLIT_ME.test +++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_TODO_SPLIT_ME.test @@ -22,7 +22,7 @@ drop table if exists t1; --enable_warnings -flush status; +flush global status; create table t1 ( c1 int primary key, c2 int, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_direction.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_direction.test index 8b579dc3ea0..923054f26a9 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_direction.test +++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_direction.test @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( id int PRIMARY KEY, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_where_clause.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_where_clause.test index 824c373bf95..24b84285517 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_where_clause.test +++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_no_where_clause.test @@ -21,7 +21,7 @@ drop table if exists t1; --enable_warnings -flush status; +flush global status; create table t1 ( c1 int primary key, c2 int, diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_order_by_primary_key.test b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_order_by_primary_key.test index 4d2236b7c12..e7dac15e19d 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_order_by_primary_key.test +++ b/storage/mroonga/mysql-test/mroonga/wrapper/t/optimization_order_limit_order_by_primary_key.test @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS memos; --enable_warnings -FLUSH STATUS; +FLUSH GLOBAL STATUS; CREATE TABLE memos ( id int PRIMARY KEY, diff --git a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_qcache.result b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_qcache.result index 2847921716c..bdfec674307 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_qcache.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_qcache.result @@ -11,7 +11,7 @@ pk c connect con1,localhost,root,,; update t1 set c = 'updated'; connection default; -flush status; +flush global status; show status like 'Qcache_hits'; Variable_name Value Qcache_hits 0 diff --git a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test index 0369e758f5d..43d010f7daa 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/rocksdb_qcache.test @@ -22,7 +22,7 @@ update t1 set c = 'updated'; #select * from t1; --connection default -flush status; +flush global status; show status like 'Qcache_hits'; show global status like 'Qcache_hits'; select * from t1; diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/mdev12179.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/mdev12179.result index a1e501f78f4..1b1949faa9f 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/r/mdev12179.result +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/r/mdev12179.result @@ -55,7 +55,7 @@ SELECT * FROM mysql.gtid_slave_pos_rocksdb ORDER BY sub_id; domain_id sub_id server_id seq_no 0 6 1 6 connection server_2; -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; SET sql_log_bin=0; SHOW STATUS LIKE "Transactions_multi_engine"; Variable_name Value @@ -146,7 +146,7 @@ DROP TABLE mysql.gtid_slave_pos_rocksdb; DROP TABLE mysql.gtid_slave_pos_myisam_redundant; DROP TABLE mysql.gtid_slave_pos_innodb_redundant; SET sql_log_bin=1; -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; include/start_slave.inc SHOW STATUS LIKE "%transactions%engine"; Variable_name Value diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/mdev12179.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/mdev12179.test index 845f155877a..20f97641b66 100644 --- a/storage/rocksdb/mysql-test/rocksdb_rpl/t/mdev12179.test +++ b/storage/rocksdb/mysql-test/rocksdb_rpl/t/mdev12179.test @@ -48,7 +48,7 @@ SELECT * FROM mysql.gtid_slave_pos_rocksdb ORDER BY sub_id; # Test status variable Transactions_multi_engine. --connection server_2 -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; SET sql_log_bin=0; SHOW STATUS LIKE "Transactions_multi_engine"; INSERT INTO t1 VALUES (100); @@ -180,7 +180,7 @@ DROP TABLE mysql.gtid_slave_pos_rocksdb; DROP TABLE mysql.gtid_slave_pos_myisam_redundant; DROP TABLE mysql.gtid_slave_pos_innodb_redundant; SET sql_log_bin=1; -FLUSH NO_WRITE_TO_BINLOG STATUS; +FLUSH NO_WRITE_TO_BINLOG GLOBAL STATUS; --source include/start_slave.inc SHOW STATUS LIKE "%transactions%engine";