diff options
Diffstat (limited to 'mysql-test')
261 files changed, 8 insertions, 13088 deletions
diff --git a/mysql-test/include/have_innodb.combinations b/mysql-test/include/have_innodb.combinations index 7e9e6b9e3b0..ac760f7fcad 100644 --- a/mysql-test/include/have_innodb.combinations +++ b/mysql-test/include/have_innodb.combinations @@ -18,36 +18,6 @@ innodb-sys-tables innodb-sys-virtual innodb-metrics -[xtradb_plugin] -ignore-builtin-innodb -plugin-load-add=$HA_XTRADB_SO -innodb -innodb-cmpmem -innodb-cmp-per-index -innodb-trx -innodb-locks -innodb-buffer-pool-stats -innodb-buffer-page -innodb-buffer-page-lru -innodb-sys-foreign -innodb-sys-foreign-cols -innodb-sys-tables -innodb-metrics - -[xtradb] -innodb -innodb-cmpmem -innodb-cmp-per-index -innodb-trx -innodb-locks -innodb-metrics -innodb-buffer-pool-stats -innodb-buffer-page -innodb-buffer-page-lru -innodb-sys-foreign -innodb-sys-foreign-cols -innodb-sys-tables - [innodb] innodb innodb-cmpmem diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc index 021970423cd..5447d935f3c 100644 --- a/mysql-test/include/have_innodb.inc +++ b/mysql-test/include/have_innodb.inc @@ -1,6 +1,6 @@ # # suite.pm will make sure that all tests including this file -# will be skipped unless innodb or xtradb is enabled +# will be skipped unless innodb is enabled # # The test below is redundant diff --git a/mysql-test/include/have_not_innodb_plugin.inc b/mysql-test/include/have_not_innodb_plugin.inc deleted file mode 100644 index e40fd811021..00000000000 --- a/mysql-test/include/have_not_innodb_plugin.inc +++ /dev/null @@ -1,4 +0,0 @@ -disable_query_log; ---require r/not_true.require -select (PLUGIN_LIBRARY LIKE 'ha_innodb_plugin%' OR PLUGIN_DESCRIPTION LIKE '%xtradb%') as `TRUE` from information_schema.plugins where PLUGIN_NAME='InnoDB'; -enable_query_log; diff --git a/mysql-test/include/have_xtradb.combinations b/mysql-test/include/have_xtradb.combinations deleted file mode 100644 index 0419dc91171..00000000000 --- a/mysql-test/include/have_xtradb.combinations +++ /dev/null @@ -1,13 +0,0 @@ -[xtradb_plugin] -ignore-builtin-innodb -plugin-load-add=$HA_XTRADB_SO -innodb -innodb-cmpmem -innodb-trx -innodb-sys-indexes - -[xtradb] -innodb -innodb-cmpmem -innodb-trx -innodb-sys-indexes diff --git a/mysql-test/include/have_xtradb.inc b/mysql-test/include/have_xtradb.inc deleted file mode 100644 index 478b9926e21..00000000000 --- a/mysql-test/include/have_xtradb.inc +++ /dev/null @@ -1,11 +0,0 @@ -# -# suite.pm will make sure that all tests including this file -# will be skipped unless xtradb is enabled -# -# The test below is redundant - -if (!`SELECT count(*) FROM information_schema.plugins WHERE - plugin_name = 'innodb' AND plugin_status = 'active' AND - plugin_description LIKE '%xtradb%'`){ - skip Needs XtraDB engine; -} diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4fc0c90c07d..3bd8dd3ce8f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -189,7 +189,6 @@ my @DEFAULT_SUITES= qw( multi_source- optimizer_unfixed_bugs- parts- - percona- perfschema- plugins- roles- @@ -1737,18 +1736,6 @@ sub command_line_setup { $opt_strace=1; } - # InnoDB does not bother to do individual de-allocations at exit. Instead it - # relies on a custom allocator to track every allocation, and frees all at - # once during exit. - # In XtraDB, an option use-sys-malloc is introduced (and on by default) to - # disable this (for performance). But this exposes Valgrind to all the - # missing de-allocations, so we need to disable it to at least get - # meaningful leak checking for the rest of the server. - if ($opt_valgrind_mysqld) - { - push(@opt_extra_mysqld_opt, "--loose-skip-innodb-use-sys-malloc"); - } - if ($opt_debug_common) { $opt_debug= 1; @@ -5966,7 +5953,7 @@ Examples: alias main.alias 'main' is the name of the suite for the 't' directory. -rpl.rpl_invoked_features,mix,xtradb_plugin +rpl.rpl_invoked_features,mix,innodb suite/rpl/t/rpl.rpl_invoked_features Options to control what engine/variation to run: diff --git a/mysql-test/r/information_schema-big.result b/mysql-test/r/information_schema-big.result index 112d4842e42..cbd8191bc54 100644 --- a/mysql-test/r/information_schema-big.result +++ b/mysql-test/r/information_schema-big.result @@ -1,5 +1,3 @@ -DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5; -DROP VIEW IF EXISTS v1; # # Bug#18925: subqueries with MIN/MAX functions on INFORMATION_SCHEMA # diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index a662a600afe..c8201b0a554 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -6,20 +6,12 @@ use My::Platform; sub skip_combinations { my @combinations; - # disable innodb/xtradb combinatons for configurations that were not built + # disable innodb combinations for configurations that were not built push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO}; - push @combinations, qw(xtradb innodb) unless $::mysqld_variables{'innodb'} eq "ON"; + push @combinations, 'innodb' unless $::mysqld_variables{'innodb'} eq "ON"; - # unconditionally, for now in 10.2. Later it could check for xtradb I_S plugins - push @combinations, 'xtradb'; - - # XtraDB is RECOMPILE_FOR_EMBEDDED, ha_xtradb.so cannot work with embedded server - push @combinations, 'xtradb_plugin' if not $ENV{HA_XTRADB_SO} - or $::opt_embedded_server; - - my %skip = ( 'include/have_innodb.combinations' => [ @combinations ], - 'include/have_xtradb.combinations' => [ @combinations ]); + my %skip = ( 'include/have_innodb.combinations' => [ @combinations ]); # don't run tests for the wrong platform $skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ]; diff --git a/mysql-test/suite/innodb/r/fake_changes-7000.result b/mysql-test/suite/innodb/r/fake_changes-7000.result deleted file mode 100644 index e41020b7d74..00000000000 --- a/mysql-test/suite/innodb/r/fake_changes-7000.result +++ /dev/null @@ -1,6 +0,0 @@ -create table t1 (i int) engine=InnoDB; -set innodb_fake_changes = 1; -insert into t1 values (1); -ERROR HY000: Got error 131 "Command not supported by database" during COMMIT -set innodb_fake_changes = 0; -drop table t1; diff --git a/mysql-test/suite/innodb/r/innodb-changed-pages.result b/mysql-test/suite/innodb/r/innodb-changed-pages.result deleted file mode 100644 index 392b5e64e2e..00000000000 --- a/mysql-test/suite/innodb/r/innodb-changed-pages.result +++ /dev/null @@ -1,72 +0,0 @@ -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 10 AND end_lsn > 20 ; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA . `INNODB_CHANGED_PAGES` AS table1 WHERE ( ( (NOT ( ( ( ( (NOT ( table1 . `page_id` <> table1 . `start_lsn` AND table1 . `space_id` <> 8) AND table1 . `page_id` >= table1 . `end_lsn`) OR table1 . `end_lsn` = table1 . `space_id`) AND table1 . `end_lsn` <> table1 . `page_id`) OR table1 . `end_lsn` < 8) AND table1 . `space_id` >= '2000-06-10 11:33:07.046821') AND table1 . `end_lsn` >= 5) AND table1 . `start_lsn` < 'mm') OR table1 . `end_lsn` != table1 . `end_lsn`) HAVING ( table1 . `start_lsn` < '2005-09-09 01:34:19.012946' OR table1 . `page_id` < 6) ORDER BY table1 . `start_lsn` -LIMIT 3; -space_id page_id start_lsn end_lsn -Warnings: -Warning 1292 Truncated incorrect DOUBLE value: 'mm' -Warning 1292 Truncated incorrect DOUBLE value: '2005-09-09 01:34:19.012946' -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn > 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn >= 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn > 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn >= 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 and end_lsn < 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 and end_lsn < 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 and end_lsn <= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 and end_lsn <= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn = 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn = 2000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn < 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn < 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn <= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn <= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn < 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn < 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn <= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn <= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn > 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn > 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn >= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn >= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn > 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn > 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn >= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn >= 3000000; -space_id page_id start_lsn end_lsn -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE (start_lsn > 2000000 and end_lsn < 3000000) or (start_lsn > 4000000 and end_lsn < 5000000); -space_id page_id start_lsn end_lsn diff --git a/mysql-test/suite/innodb/r/innodb-flush-changed-page-bitmaps.result b/mysql-test/suite/innodb/r/innodb-flush-changed-page-bitmaps.result deleted file mode 100644 index 5f098b8ecbf..00000000000 --- a/mysql-test/suite/innodb/r/innodb-flush-changed-page-bitmaps.result +++ /dev/null @@ -1,4 +0,0 @@ -FLUSH NO_WRITE_TO_BINLOG changed_page_bitmaps; -select * from information_schema.changed_page_bitmaps; -dummy -0 diff --git a/mysql-test/suite/innodb/t/fake_changes-7000.test b/mysql-test/suite/innodb/t/fake_changes-7000.test deleted file mode 100644 index 2be6be2d476..00000000000 --- a/mysql-test/suite/innodb/t/fake_changes-7000.test +++ /dev/null @@ -1,9 +0,0 @@ ---source include/have_log_bin.inc ---source include/have_xtradb.inc - -create table t1 (i int) engine=InnoDB; -set innodb_fake_changes = 1; ---disable_abort_on_error -insert into t1 values (1); -set innodb_fake_changes = 0; -drop table t1; diff --git a/mysql-test/suite/innodb/t/innodb-changed-pages-master.opt b/mysql-test/suite/innodb/t/innodb-changed-pages-master.opt deleted file mode 100644 index bdee9614faa..00000000000 --- a/mysql-test/suite/innodb/t/innodb-changed-pages-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb-track-changed-pages=0 --innodb-changed-pages=1
\ No newline at end of file diff --git a/mysql-test/suite/innodb/t/innodb-changed-pages.test b/mysql-test/suite/innodb/t/innodb-changed-pages.test deleted file mode 100644 index 14668af25cb..00000000000 --- a/mysql-test/suite/innodb/t/innodb-changed-pages.test +++ /dev/null @@ -1,63 +0,0 @@ --- source include/have_xtradb.inc - -# -# This test requires innodb-changed-pages=1 so that necessary information schema table exists -# and innodb-track-changed-pages=0 to disable actual changed pages tracking, because -# page number are not consistent from run to run -# - -# -# MDEV-4791: ssertion range_end >= range_start fails in log0online.c -# on select from I_S.INNODB_CHANGED_PAGES - -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 10 AND end_lsn > 20 ; - -SELECT * FROM INFORMATION_SCHEMA . `INNODB_CHANGED_PAGES` AS table1 WHERE ( ( (NOT ( ( ( ( (NOT ( table1 . `page_id` <> table1 . `start_lsn` AND table1 . `space_id` <> 8) AND table1 . `page_id` >= table1 . `end_lsn`) OR table1 . `end_lsn` = table1 . `space_id`) AND table1 . `end_lsn` <> table1 . `page_id`) OR table1 . `end_lsn` < 8) AND table1 . `space_id` >= '2000-06-10 11:33:07.046821') AND table1 . `end_lsn` >= 5) AND table1 . `start_lsn` < 'mm') OR table1 . `end_lsn` != table1 . `end_lsn`) HAVING ( table1 . `start_lsn` < '2005-09-09 01:34:19.012946' OR table1 . `page_id` < 6) ORDER BY table1 . `start_lsn` -LIMIT 3; - -# -# Basic tests -# - -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES; - -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn > 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn >= 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn > 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn >= 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 and end_lsn < 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 and end_lsn < 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 and end_lsn <= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 and end_lsn <= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn = 2000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE end_lsn = 2000000; - -# -# OR -# -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn < 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn < 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn <= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn <= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn < 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn < 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn <= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn <= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn > 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn > 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn < 2000000 or end_lsn >= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn <= 2000000 or end_lsn >= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn > 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn > 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn > 2000000 or end_lsn >= 3000000; -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE start_lsn >= 2000000 or end_lsn >= 3000000; - -# -# Range -# -SELECT * FROM INFORMATION_SCHEMA.INNODB_CHANGED_PAGES WHERE (start_lsn > 2000000 and end_lsn < 3000000) or (start_lsn > 4000000 and end_lsn < 5000000); - diff --git a/mysql-test/suite/innodb/t/innodb-flush-changed-page-bitmaps.opt b/mysql-test/suite/innodb/t/innodb-flush-changed-page-bitmaps.opt deleted file mode 100644 index afa6311a74b..00000000000 --- a/mysql-test/suite/innodb/t/innodb-flush-changed-page-bitmaps.opt +++ /dev/null @@ -1,2 +0,0 @@ ---changed-page-bitmaps ---innodb-track-changed-pages diff --git a/mysql-test/suite/innodb/t/innodb-flush-changed-page-bitmaps.test b/mysql-test/suite/innodb/t/innodb-flush-changed-page-bitmaps.test deleted file mode 100644 index 662bbbaacaf..00000000000 --- a/mysql-test/suite/innodb/t/innodb-flush-changed-page-bitmaps.test +++ /dev/null @@ -1,5 +0,0 @@ --- source include/have_xtradb.inc --- source include/not_embedded.inc - -FLUSH NO_WRITE_TO_BINLOG changed_page_bitmaps; -select * from information_schema.changed_page_bitmaps; diff --git a/mysql-test/suite/percona/disabled.def b/mysql-test/suite/percona/disabled.def deleted file mode 100644 index cd3fd72cc54..00000000000 --- a/mysql-test/suite/percona/disabled.def +++ /dev/null @@ -1,45 +0,0 @@ -percona_sync_flush: removed from XtraDB-26.0 - -percona_suppress_log_warning_1592: Feature not merged into MariaDB -percona_log_slow_slave_statements: Feature not merged into MariaDB -percona_log_slow_slave_statements-and-use_global_long_query_time: Feature not merged into MariaDB -percona_slow_query_log-control_global_slow: Feature not merged into MariaDB -percona_slow_query_log-microseconds_in_slow_query_log: Feature not merged into MariaDB -percona_query_cache_with_comments: Feature not merged into MariaDB -percona_query_cache_with_comments_prepared_statements: Feature not merged into MariaDB -percona_show_temp_tables: Feature not merged into MariaDB -percona_slow_query_log-use_global_long_query_time: Feature not merged into MariaDB -percona_query_cache_with_comments_disable: Feature not merged into MariaDB -percona_log_connection_error: Feature not merged into MariaDB -percona_query_response_time: Feature not merged into MariaDB -percona_query_response_time-stored: Feature not merged into MariaDB -percona_sql_no_fcache: Feature not merged into MariaDB -percona_status_wait_query_cache_mutex: Feature not merged into MariaDB -percona_slave_innodb_stats: Feature not merged into MariaDB -percona_query_response_time-replication: Feature not merged into MariaDB -percona_server_variables_debug: Feature not merged into MariaDB -percona_server_variables_release: Feature not merged into MariaDB -percona_slow_query_log-log_slow_verbosity: InnoDB filtering information not fully merged into MariaDB -percona_innodb_buffer_pool_shm: Requires big shmmax not default on many systems -percona_log_warnings_suppress: Feature not merged into MariaDB -percona_slow_extended-log_slow_sp_statements-cl: Feature not merged into MariaDB -percona_slow_extended-log_slow_verbosity-cl: Feature not merged into MariaDB -slow_query_log_use_global_control: Feature not merged into MariaDB -percona_slow_extended-use_global_control: Feature not merged into MariaDB -percona_slow_query_log-log_slow_verbosity: Feature not merged into MariaDB -percona_slow_extended-log_slow_verbosity: Feature not merged into MariaDB -percona_slow_extended-microseconds_in_slow_extended: Feature not merged into MariaDB -percona_slow_extended-use_global_long_query_time: Feature not merged into MariaDB -percona_slow_extended-slow_query_log_timestamp_always-cl: Feature not merged into MariaDB -percona_slow_extended-slow_query_log_microseconds_timestamp-cl: Feature not merged into MariaDB -percona_bug643149: Feature not merged into MariaDB -percona_processlist_row_stats: Feature not merged into MariaDB -percona_server_variables_debug: Feature not merged into MariaDB -percona_slow_extended-slave_statements: Feature not merged into MariaDB -percona_show_slave_status_nolock: Feature not merged into MariaDB -percona_slow_extended-slave_innodb_stats: Feature not merged into MariaDB -percona_slow_extended-slave_statements-and-use_global_long_query_time: Feature not merged into MariaDB -userstat_bug602047: Feature not merged into MariaDB -percona_innodb_expand_fast_index_creation: Feature not merged into MariaDB -percona_innodb_kill_idle_trx: Feature not merged into MariaDB -percona_innodb_kill_idle_trx_locks: Feature not merged into MariaDB diff --git a/mysql-test/suite/percona/have_response_time_distribution.inc b/mysql-test/suite/percona/have_response_time_distribution.inc deleted file mode 100644 index 45650133b31..00000000000 --- a/mysql-test/suite/percona/have_response_time_distribution.inc +++ /dev/null @@ -1,4 +0,0 @@ -if (`SELECT @@have_response_time_distribution != 'YES'`) -{ - --skip No response time distribution -} diff --git a/mysql-test/suite/percona/have_response_time_distribution.require b/mysql-test/suite/percona/have_response_time_distribution.require deleted file mode 100644 index fd7196830ff..00000000000 --- a/mysql-test/suite/percona/have_response_time_distribution.require +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -have_response_time_distribution YES diff --git a/mysql-test/suite/percona/innodb_sys_index.result b/mysql-test/suite/percona/innodb_sys_index.result deleted file mode 100644 index 2bf2d576086..00000000000 --- a/mysql-test/suite/percona/innodb_sys_index.result +++ /dev/null @@ -1,11 +0,0 @@ -SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ; -CREATE TABLE test.t1 ( `a` SERIAL NOT NULL , `b` VARCHAR( 255 ) NOT NULL , INDEX ( `b` ) ) ENGINE = InnoDB ; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; -drop table test.t1; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; -SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ; -CREATE TABLE test.t1 ( `a` SERIAL NOT NULL , `b` VARCHAR( 255 ) NOT NULL , INDEX ( `b` ) ) ENGINE = InnoDB ; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; -SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ; -drop table test.t1; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; diff --git a/mysql-test/suite/percona/innodb_sys_index.test b/mysql-test/suite/percona/innodb_sys_index.test deleted file mode 100644 index 8e242bda98e..00000000000 --- a/mysql-test/suite/percona/innodb_sys_index.test +++ /dev/null @@ -1,19 +0,0 @@ ---source include/big_test.inc ---source include/have_xtradb.inc - -# -# test for bug LP#875797 "Using 'innodb_sys_indexes' causes core dump" -# ---disable_result_log -SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ; -CREATE TABLE test.t1 ( `a` SERIAL NOT NULL , `b` VARCHAR( 255 ) NOT NULL , INDEX ( `b` ) ) ENGINE = InnoDB ; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; -drop table test.t1; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; -SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ; -CREATE TABLE test.t1 ( `a` SERIAL NOT NULL , `b` VARCHAR( 255 ) NOT NULL , INDEX ( `b` ) ) ENGINE = InnoDB ; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; -SELECT COUNT(*) FROM `information_schema`.`INNODB_SYS_INDEXES` ; -drop table test.t1; -SHOW TABLE STATUS FROM `information_schema` LIKE 'INNODB\_SYS\_INDEXES%' ; ---enable_result_log diff --git a/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error-master.opt b/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error-master.opt deleted file mode 100644 index 4658d62af60..00000000000 --- a/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error-master.opt +++ /dev/null @@ -1 +0,0 @@ ---log-error diff --git a/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error.result b/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error.result deleted file mode 100644 index 352c9ca2a99..00000000000 --- a/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error.result +++ /dev/null @@ -1,16 +0,0 @@ -SET @old_max_connections = @@max_connections; -SET @old_log_warnings = @@log_warnings; -SET GLOBAL max_connections=2; -SET GLOBAL LOG_WARNINGS = 0; -connect(localhost,root,,test,port,socket); -ERROR HY000: Too many connections -SET GLOBAL LOG_WARNINGS = 1; -connect(localhost,root,,test,port,socket); -ERROR HY000: Too many connections -SET GLOBAL LOG_WARNINGS = 0; -connect(localhost,root,,test,port,socket); -ERROR HY000: Too many connections -SET GLOBAL max_connections = @old_max_connections; -SET GLOBAL log_warnings = @old_log_warnings; -[log_grep.inc] file: percona.log_connection_error.err pattern: Too many connections -[log_grep.inc] lines: 1 diff --git a/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error.test b/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error.test deleted file mode 100644 index 048102d0499..00000000000 --- a/mysql-test/suite/percona/log_connection_error.patch/percona_log_connection_error.test +++ /dev/null @@ -1,54 +0,0 @@ ---source include/not_embedded.inc - -connect (main,localhost,root,,); -connection main; -SET @old_max_connections = @@max_connections; -SET @old_log_warnings = @@log_warnings; -SET GLOBAL max_connections=2; -let $port=`SELECT Variable_value FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name LIKE 'port'`; -let $socket=`SELECT Variable_value FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE Variable_name LIKE 'socket'`; - -SET GLOBAL LOG_WARNINGS = 0; ---connect (conn0,localhost,root,,) -connection conn0; -replace_result $port port $socket socket; ---error 1040 ---connect(conn1,localhost,root,,) -disconnect conn0; -SLEEP 0.1; # tsarev: hack, but i don't know (and didn't find) how right - -connection main; -SET GLOBAL LOG_WARNINGS = 1; ---connect (conn1,localhost,root,,) -replace_result $port port $socket socket; ---error 1040 ---connect (conn0,localhost,root,,) -disconnect conn1; -SLEEP 0.1; # tsarev: hack, but i don't know (and didn't find) how right - -connection main; -SET GLOBAL LOG_WARNINGS = 0; ---connect (conn0,localhost,root,,) -replace_result $port port $socket socket; ---error 1040 ---connect(conn1,localhost,root,,) -disconnect conn0; -SLEEP 0.1; # tsarev: hack, but i don't know (and didn't find) how right - -connection main; -SET GLOBAL max_connections = @old_max_connections; -SET GLOBAL log_warnings = @old_log_warnings; -let $log_error_= `SELECT @@GLOBAL.log_error`; -if(!`select LENGTH('$log_error_')`) -{ - # MySQL Server on windows is started with --console and thus - # does not know the location of its .err log, use default location - let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err; -} - ---let log_error=$log_error_ ---let log_file=percona.log_connection_error.err ---let log_file_full_path=$log_error ---let grep_pattern= Too many connections ---source log_grep.inc - diff --git a/mysql-test/suite/percona/percona_flush_contiguous_neighbors-master.opt b/mysql-test/suite/percona/percona_flush_contiguous_neighbors-master.opt deleted file mode 100644 index f61926581b7..00000000000 --- a/mysql-test/suite/percona/percona_flush_contiguous_neighbors-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb_flush_neighbor_pages=cont diff --git a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.result b/mysql-test/suite/percona/percona_flush_contiguous_neighbors.result deleted file mode 100644 index 8c6b81f0848..00000000000 --- a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.result +++ /dev/null @@ -1,21 +0,0 @@ -DROP TABLE IF EXISTS t1; -CREATE TABLE t1 (id INT AUTO_INCREMENT, foo CHAR(255), PRIMARY KEY (id)) ENGINE=InnoDB; -INSERT INTO t1(foo) VALUES ('a'), ('b'); -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test b/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test deleted file mode 100644 index 728081fc493..00000000000 --- a/mysql-test/suite/percona/percona_flush_contiguous_neighbors.test +++ /dev/null @@ -1,37 +0,0 @@ -# Test for innodb_flush_neighbor_pages=contiguous. -# The test is very crude: we simply overflow the buffer pool with such a number of -# new/modified pages that some flushing is bound to happen. - ---source include/have_xtradb.inc ---source include/big_test.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - -CREATE TABLE t1 (id INT AUTO_INCREMENT, foo CHAR(255), PRIMARY KEY (id)) ENGINE=InnoDB; - -INSERT INTO t1(foo) VALUES ('a'), ('b'); -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; -INSERT INTO t1(foo) SELECT foo FROM t1; - -# TODO: cannot record a stable value here. A check of > 0 should be enough, -# but the variable is not accessible through INFORMATION_SCHEMA currently. -# SHOW GLOBAL STATUS LIKE 'Innodb_buffer_pool_pages_flushed'; - -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_innodb_buffer_pool_shm-master.opt b/mysql-test/suite/percona/percona_innodb_buffer_pool_shm-master.opt deleted file mode 100644 index 5974ef6e2be..00000000000 --- a/mysql-test/suite/percona/percona_innodb_buffer_pool_shm-master.opt +++ /dev/null @@ -1 +0,0 @@ ---innodb_buffer_pool_shm_key=123456 diff --git a/mysql-test/suite/percona/percona_innodb_buffer_pool_shm.result b/mysql-test/suite/percona/percona_innodb_buffer_pool_shm.result deleted file mode 100644 index e5373606099..00000000000 --- a/mysql-test/suite/percona/percona_innodb_buffer_pool_shm.result +++ /dev/null @@ -1,4 +0,0 @@ -show variables like 'innodb_buffer_pool_shm%'; -Variable_name Value -innodb_buffer_pool_shm_checksum ON -innodb_buffer_pool_shm_key 123456 diff --git a/mysql-test/suite/percona/percona_innodb_buffer_pool_shm.test b/mysql-test/suite/percona/percona_innodb_buffer_pool_shm.test deleted file mode 100644 index 7b26c217893..00000000000 --- a/mysql-test/suite/percona/percona_innodb_buffer_pool_shm.test +++ /dev/null @@ -1,2 +0,0 @@ ---source include/have_xtradb.inc -show variables like 'innodb_buffer_pool_shm%'; diff --git a/mysql-test/suite/percona/percona_innodb_deadlock_count.result b/mysql-test/suite/percona/percona_innodb_deadlock_count.result deleted file mode 100644 index b2af780778d..00000000000 --- a/mysql-test/suite/percona/percona_innodb_deadlock_count.result +++ /dev/null @@ -1,28 +0,0 @@ -connect con1,localhost,root,,; -connect con2,localhost,root,,; -connect con3,localhost,root,,; -# Drop test table -drop table if exists t; -# Create test table -create table t(a INT PRIMARY KEY, b INT) engine=InnoDB; -# Insert two rows to test table -insert into t values(2,1); -insert into t values(1,2); -connection con1; -BEGIN; -SELECT b FROM t WHERE a=1 FOR UPDATE; -connection con2; -BEGIN; -SELECT b FROM t WHERE a=2 FOR UPDATE; -connection con1; -SELECT b FROM t WHERE a=2 FOR UPDATE; -connection con2; -SELECT b FROM t WHERE a=1 FOR UPDATE; -connection con1; -ROLLBACK; -connection con2; -ROLLBACK; -connection con3; -Deadlocks: 1 -# Drop test table -drop table t; diff --git a/mysql-test/suite/percona/percona_innodb_deadlock_count.test b/mysql-test/suite/percona/percona_innodb_deadlock_count.test deleted file mode 100644 index da1273bc038..00000000000 --- a/mysql-test/suite/percona/percona_innodb_deadlock_count.test +++ /dev/null @@ -1,51 +0,0 @@ ---source include/have_xtradb.inc -connect (con1,localhost,root,,); -connect (con2,localhost,root,,); -connect (con3,localhost,root,,); ---echo # Drop test table ---disable_warnings -drop table if exists t; ---enable_warnings - ---echo # Create test table -create table t(a INT PRIMARY KEY, b INT) engine=InnoDB; ---echo # Insert two rows to test table -insert into t values(2,1); -insert into t values(1,2); - -#--echo # Save current deadlock count -let $current = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_deadlocks'`; - ---disable_result_log - -connection con1; -BEGIN; SELECT b FROM t WHERE a=1 FOR UPDATE; - -connection con2; -BEGIN; SELECT b FROM t WHERE a=2 FOR UPDATE; - -connection con1; -SEND SELECT b FROM t WHERE a=2 FOR UPDATE; - -connection con2; -SEND SELECT b FROM t WHERE a=1 FOR UPDATE; - -connection con1; ---error 0, ER_LOCK_DEADLOCK -reap; -ROLLBACK; - -connection con2; ---error 0, ER_LOCK_DEADLOCK -reap; -ROLLBACK; - -connection con3; -let $result = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_deadlocks'`; - ---enable_result_log - -let $diff = `SELECT $result - $current`; -echo Deadlocks: $diff; ---echo # Drop test table -drop table t; diff --git a/mysql-test/suite/percona/percona_innodb_expand_fast_index_creation.result b/mysql-test/suite/percona/percona_innodb_expand_fast_index_creation.result deleted file mode 100644 index b8cec3d4398..00000000000 --- a/mysql-test/suite/percona/percona_innodb_expand_fast_index_creation.result +++ /dev/null @@ -1,64 +0,0 @@ -CREATE TABLE t1( -id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, -a CHAR(1) NOT NULL, -b CHAR(36) NOT NULL) ENGINE=InnoDB; -INSERT INTO t1(a,b) VALUES ('a','b'); -INSERT INTO t1(a,b) SELECT a,b FROM t1; -INSERT INTO t1(a,b) SELECT a,b FROM t1; -INSERT INTO t1(a,b) SELECT a,b FROM t1; -INSERT INTO t1(a,b) SELECT a,b FROM t1; -ALTER TABLE t1 ADD KEY (a); -affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 0 -EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; -id 1 -select_type SIMPLE -table t1 -type ALL -possible_keys a -key NULL -key_len NULL -ref NULL -rows 16 -Extra -id 1 -select_type SIMPLE -table t2 -type ref -possible_keys a -key a -key_len 1 -ref test.t1.a -rows 1 -Extra Using where -ALTER TABLE t1 DROP KEY a; -SET expand_fast_index_creation = 1; -SELECT @@expand_fast_index_creation; -@@expand_fast_index_creation -1 -ALTER TABLE t1 ADD KEY (a); -affected rows: 0 -info: Records: 0 Duplicates: 0 Warnings: 0 -EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; -id 1 -select_type SIMPLE -table t1 -type ALL -possible_keys a -key NULL -key_len NULL -ref NULL -rows 16 -Extra -id 1 -select_type SIMPLE -table t2 -type ALL -possible_keys a -key NULL -key_len NULL -ref NULL -rows 16 -Extra Using where; Using join buffer -SET expand_fast_index_creation = 0; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_innodb_expand_fast_index_creation.test b/mysql-test/suite/percona/percona_innodb_expand_fast_index_creation.test deleted file mode 100644 index 06e6c719c17..00000000000 --- a/mysql-test/suite/percona/percona_innodb_expand_fast_index_creation.test +++ /dev/null @@ -1,45 +0,0 @@ ---source include/have_innodb.inc - -######################################################################## -# Bug #857590: Fast index creation does not update index statistics -######################################################################## - -CREATE TABLE t1( - id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - a CHAR(1) NOT NULL, - b CHAR(36) NOT NULL) ENGINE=InnoDB; - -INSERT INTO t1(a,b) VALUES ('a','b'); -INSERT INTO t1(a,b) SELECT a,b FROM t1; -INSERT INTO t1(a,b) SELECT a,b FROM t1; -INSERT INTO t1(a,b) SELECT a,b FROM t1; -INSERT INTO t1(a,b) SELECT a,b FROM t1; - -# Check that fast index creation is used ---enable_info -ALTER TABLE t1 ADD KEY (a); ---disable_info - -# The default (wrong) plan due to bogus statistics ---vertical_results -EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; ---horizontal_results - -ALTER TABLE t1 DROP KEY a; - -SET expand_fast_index_creation = 1; -SELECT @@expand_fast_index_creation; - -# Check that stats are updated with the option enabled - ---enable_info -ALTER TABLE t1 ADD KEY (a); ---disable_info - ---vertical_results -EXPLAIN SELECT COUNT(*) FROM t1, t1 t2 WHERE t1.a = t2.a AND t1.b = t2.b; ---horizontal_results - -SET expand_fast_index_creation = 0; - -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_innodb_fake_changes.result b/mysql-test/suite/percona/percona_innodb_fake_changes.result deleted file mode 100644 index 1b870fdbb92..00000000000 --- a/mysql-test/suite/percona/percona_innodb_fake_changes.result +++ /dev/null @@ -1,55 +0,0 @@ -DROP TABLE IF EXISTS t1; -# Checking variables -SHOW VARIABLES LIKE 'innodb_fake_changes'; -Variable_name Value -innodb_fake_changes OFF -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; -VARIABLE_VALUE -OFF -SET innodb_fake_changes=1; -SHOW VARIABLES LIKE 'innodb_fake_changes'; -Variable_name Value -innodb_fake_changes ON -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; -VARIABLE_VALUE -ON -SET innodb_fake_changes=default; -SHOW VARIABLES LIKE 'innodb_fake_changes'; -Variable_name Value -innodb_fake_changes OFF -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; -VARIABLE_VALUE -OFF -# Explicit COMMIT should fail when innodb_fake_changes is enabled -# DML should be fine -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1); -SET autocommit=0; -SET innodb_fake_changes=1; -BEGIN; -INSERT INTO t1 VALUES (2); -UPDATE t1 SET a=0; -DELETE FROM t1 LIMIT 1; -SELECT * FROM t1; -a -1 -COMMIT; -ERROR HY000: Got error 131 "Command not supported by database" during COMMIT -SET innodb_fake_changes=default; -DROP TABLE t1; -# DDL must result in error -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -SET autocommit=0; -SET innodb_fake_changes=1; -BEGIN; -CREATE TABLE t2 (a INT) ENGINE=InnoDB; -ERROR HY000: Can't create table `test`.`t2` (errno: 131 "Command not supported by database") -DROP TABLE t1; -ERROR HY000: Storage engine InnoDB of the table `test`.`t1` doesn't have this option -TRUNCATE TABLE t1; -ERROR HY000: Got error 131 "Command not supported by database" during COMMIT -ALTER TABLE t1 ENGINE=MyISAM; -ERROR HY000: Got error 131 "Command not supported by database" during COMMIT -ROLLBACK; -SET innodb_fake_changes=default; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_innodb_fake_changes.test b/mysql-test/suite/percona/percona_innodb_fake_changes.test deleted file mode 100644 index 67f5450ba45..00000000000 --- a/mysql-test/suite/percona/percona_innodb_fake_changes.test +++ /dev/null @@ -1,49 +0,0 @@ ---source include/have_xtradb.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - - ---echo # Checking variables -SHOW VARIABLES LIKE 'innodb_fake_changes'; -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; -SET innodb_fake_changes=1; -SHOW VARIABLES LIKE 'innodb_fake_changes'; -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; -SET innodb_fake_changes=default; -SHOW VARIABLES LIKE 'innodb_fake_changes'; -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; - ---echo # Explicit COMMIT should fail when innodb_fake_changes is enabled ---echo # DML should be fine -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1); -SET autocommit=0; -SET innodb_fake_changes=1; -BEGIN; -INSERT INTO t1 VALUES (2); -UPDATE t1 SET a=0; -DELETE FROM t1 LIMIT 1; -SELECT * FROM t1; ---error 1180 -COMMIT; -SET innodb_fake_changes=default; -DROP TABLE t1; - ---echo # DDL must result in error -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -SET autocommit=0; -SET innodb_fake_changes=1; -BEGIN; ---error 1005 -CREATE TABLE t2 (a INT) ENGINE=InnoDB; ---error 1031 -DROP TABLE t1; ---error 1180 -TRUNCATE TABLE t1; ---error 1180 -ALTER TABLE t1 ENGINE=MyISAM; -ROLLBACK; -SET innodb_fake_changes=default; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_innodb_fake_changes_locks.result b/mysql-test/suite/percona/percona_innodb_fake_changes_locks.result deleted file mode 100644 index 233b55b8ac4..00000000000 --- a/mysql-test/suite/percona/percona_innodb_fake_changes_locks.result +++ /dev/null @@ -1,23 +0,0 @@ -DROP TABLE IF EXISTS t1; -# Verifying that X_LOCK not acquired -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1); -connect conn1,localhost,root,,; -connection conn1; -SET autocommit=0; -SET innodb_fake_changes=1; -BEGIN; -SELECT * FROM t1 FOR UPDATE; -a -1 -connection default; -SET innodb_lock_wait_timeout=3; -UPDATE t1 SET a=2; -ERROR HY000: Lock wait timeout exceeded; try restarting transaction -SELECT * FROM t1 LOCK IN SHARE MODE; -a -1 -connection conn1; -ROLLBACK; -SET innodb_fake_changes=default; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_innodb_fake_changes_locks.test b/mysql-test/suite/percona/percona_innodb_fake_changes_locks.test deleted file mode 100644 index ce15fc0bf43..00000000000 --- a/mysql-test/suite/percona/percona_innodb_fake_changes_locks.test +++ /dev/null @@ -1,24 +0,0 @@ ---source include/have_xtradb.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - ---echo # Verifying that X_LOCK not acquired -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1); ---connect (conn1,localhost,root,,) ---connection conn1 -SET autocommit=0; -SET innodb_fake_changes=1; -BEGIN; -SELECT * FROM t1 FOR UPDATE; ---connection default -SET innodb_lock_wait_timeout=3; ---error 1205 -UPDATE t1 SET a=2; -SELECT * FROM t1 LOCK IN SHARE MODE; ---connection conn1 -ROLLBACK; -SET innodb_fake_changes=default; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_innodb_kill_idle_trx.result b/mysql-test/suite/percona/percona_innodb_kill_idle_trx.result deleted file mode 100644 index a05b5a912fe..00000000000 --- a/mysql-test/suite/percona/percona_innodb_kill_idle_trx.result +++ /dev/null @@ -1,41 +0,0 @@ -DROP TABLE IF EXISTS t1; -SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; -Variable_name Value -innodb_kill_idle_transaction 0 -SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_KILL_IDLE_TRANSACTION 0 -SET GLOBAL innodb_kill_idle_transaction=1; -SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; -Variable_name Value -innodb_kill_idle_transaction 1 -SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_KILL_IDLE_TRANSACTION 1 -BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -COMMIT; -SELECT * FROM t1; -a -1 -2 -3 -BEGIN; -INSERT INTO t1 VALUES (4),(5),(6); -SELECT * FROM t1; -ERROR HY000: MySQL server has gone away -SELECT * FROM t1; -a -1 -2 -3 -DROP TABLE t1; -SET GLOBAL innodb_kill_idle_transaction=0; -SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; -Variable_name Value -innodb_kill_idle_transaction 0 -SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_KILL_IDLE_TRANSACTION 0 diff --git a/mysql-test/suite/percona/percona_innodb_kill_idle_trx.test b/mysql-test/suite/percona/percona_innodb_kill_idle_trx.test deleted file mode 100644 index e1b7b778a31..00000000000 --- a/mysql-test/suite/percona/percona_innodb_kill_idle_trx.test +++ /dev/null @@ -1,28 +0,0 @@ ---source include/have_innodb.inc ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - -SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; - ---source percona_innodb_kill_idle_trx_show.inc -SET GLOBAL innodb_kill_idle_transaction=1; ---source percona_innodb_kill_idle_trx_show.inc - -BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -COMMIT; -SELECT * FROM t1; - -BEGIN; -INSERT INTO t1 VALUES (4),(5),(6); -sleep 3; - ---enable_reconnect ---error 2006 --error CR_SERVER_GONE_ERROR -SELECT * FROM t1; -SELECT * FROM t1; -DROP TABLE t1; -SET GLOBAL innodb_kill_idle_transaction=0; ---source percona_innodb_kill_idle_trx_show.inc diff --git a/mysql-test/suite/percona/percona_innodb_kill_idle_trx_locks.result b/mysql-test/suite/percona/percona_innodb_kill_idle_trx_locks.result deleted file mode 100644 index 6bdd2617805..00000000000 --- a/mysql-test/suite/percona/percona_innodb_kill_idle_trx_locks.result +++ /dev/null @@ -1,45 +0,0 @@ -DROP TABLE IF EXISTS t1; -SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; -SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; -Variable_name Value -innodb_kill_idle_transaction 0 -SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_KILL_IDLE_TRANSACTION 0 -SET GLOBAL innodb_kill_idle_transaction=5; -SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; -Variable_name Value -innodb_kill_idle_transaction 5 -SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_KILL_IDLE_TRANSACTION 5 -BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -COMMIT; -SELECT * FROM t1; -a -1 -2 -3 -### Locking rows. Lock should be released when idle trx is killed. -BEGIN; -SELECT * FROM t1 FOR UPDATE; -a -1 -2 -3 -UPDATE t1 set a=4; -SELECT * FROM t1; -a -4 -4 -4 -DROP TABLE t1; -SET GLOBAL innodb_kill_idle_transaction=0; -SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; -Variable_name Value -innodb_kill_idle_transaction 0 -SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_KILL_IDLE_TRANSACTION 0 diff --git a/mysql-test/suite/percona/percona_innodb_kill_idle_trx_locks.test b/mysql-test/suite/percona/percona_innodb_kill_idle_trx_locks.test deleted file mode 100644 index c283f38de42..00000000000 --- a/mysql-test/suite/percona/percona_innodb_kill_idle_trx_locks.test +++ /dev/null @@ -1,31 +0,0 @@ ---source include/have_innodb.inc ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - -SET autocommit=0; -CREATE TABLE t1 (a INT) ENGINE=InnoDB; - ---source percona_innodb_kill_idle_trx_show.inc -SET GLOBAL innodb_kill_idle_transaction=5; ---source percona_innodb_kill_idle_trx_show.inc - -connect (conn1,localhost,root,,); -connection conn1; - -BEGIN; -INSERT INTO t1 VALUES (1),(2),(3); -COMMIT; -SELECT * FROM t1; - ---echo ### Locking rows. Lock should be released when idle trx is killed. -BEGIN; -SELECT * FROM t1 FOR UPDATE; - -connection default; -UPDATE t1 set a=4; - -SELECT * FROM t1; -DROP TABLE t1; -SET GLOBAL innodb_kill_idle_transaction=0; ---source percona_innodb_kill_idle_trx_show.inc diff --git a/mysql-test/suite/percona/percona_innodb_kill_idle_trx_show.inc b/mysql-test/suite/percona/percona_innodb_kill_idle_trx_show.inc deleted file mode 100644 index c85c0311c81..00000000000 --- a/mysql-test/suite/percona/percona_innodb_kill_idle_trx_show.inc +++ /dev/null @@ -1,2 +0,0 @@ -SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction'; -SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction'; diff --git a/mysql-test/suite/percona/percona_log_warnings_suppress-master.opt b/mysql-test/suite/percona/percona_log_warnings_suppress-master.opt deleted file mode 100644 index 4658d62af60..00000000000 --- a/mysql-test/suite/percona/percona_log_warnings_suppress-master.opt +++ /dev/null @@ -1 +0,0 @@ ---log-error diff --git a/mysql-test/suite/percona/percona_log_warnings_suppress.result b/mysql-test/suite/percona/percona_log_warnings_suppress.result deleted file mode 100644 index 1ee6c46738a..00000000000 --- a/mysql-test/suite/percona/percona_log_warnings_suppress.result +++ /dev/null @@ -1,31 +0,0 @@ -SET @old_log_warnings = @@log_warnings; -SET @old_log_warnings_suppress = @@log_warnings_suppress; -DROP TABLE IF EXISTS t1; -CREATE TABLE t1 (a VARCHAR(36), b VARCHAR(20)); -SET GLOBAL log_warnings_suppress=''; -SET GLOBAL LOG_WARNINGS=0; -SHOW GLOBAL VARIABLES LIKE 'log_warnings_suppress'; -Variable_name Value -log_warnings_suppress -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -SET GLOBAL LOG_WARNINGS=1; -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -SET GLOBAL log_warnings_suppress='1592'; -SET GLOBAL LOG_WARNINGS=0; -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -SET GLOBAL LOG_WARNINGS=1; -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -Warnings: -Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave. -DROP TABLE t1; -SET GLOBAL log_warnings = @old_log_warnings; -SET GLOBAL log_warnings_suppress = @old_log_warnings_suppress; -# Count the number of times the "Unsafe" message was printed -# to the error log. -Occurrences: 1 diff --git a/mysql-test/suite/percona/percona_log_warnings_suppress.test b/mysql-test/suite/percona/percona_log_warnings_suppress.test deleted file mode 100644 index 82221013f0b..00000000000 --- a/mysql-test/suite/percona/percona_log_warnings_suppress.test +++ /dev/null @@ -1,47 +0,0 @@ --- source include/have_log_bin.inc --- source include/have_binlog_format_statement.inc - -SET @old_log_warnings = @@log_warnings; -SET @old_log_warnings_suppress = @@log_warnings_suppress; - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings -CREATE TABLE t1 (a VARCHAR(36), b VARCHAR(20)); -SET GLOBAL log_warnings_suppress=''; -SET GLOBAL LOG_WARNINGS=0; -SHOW GLOBAL VARIABLES LIKE 'log_warnings_suppress'; -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -SET GLOBAL LOG_WARNINGS=1; -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -SET GLOBAL log_warnings_suppress='1592'; -SET GLOBAL LOG_WARNINGS=0; -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -SET GLOBAL LOG_WARNINGS=1; -INSERT INTO t1 VALUES(UUID(), 'suppress_1592'); -DROP TABLE t1; - -SET GLOBAL log_warnings = @old_log_warnings; -SET GLOBAL log_warnings_suppress = @old_log_warnings_suppress; - -let $log_error_= `SELECT @@GLOBAL.log_error`; -if(!`select LENGTH('$log_error_')`) -{ - # MySQL Server on windows is started with --console and thus - # does not know the location of its .err log, use default location - let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err; -} -# Assign env variable LOG_ERROR -let LOG_ERROR=$log_error_; - ---echo # Count the number of times the "Unsafe" message was printed ---echo # to the error log. - -perl; - use strict; - my $log_error= $ENV{'LOG_ERROR'} or die "LOG_ERROR not set"; - open(FILE, "$log_error") or die("Unable to open $log_error: $!\n"); - my $count = () = grep(/suppress_1592/g,<FILE>); - print "Occurrences: $count\n"; - close(FILE); -EOF diff --git a/mysql-test/suite/percona/percona_processlist_row_stats.result b/mysql-test/suite/percona/percona_processlist_row_stats.result deleted file mode 100644 index 109b6a912d9..00000000000 --- a/mysql-test/suite/percona/percona_processlist_row_stats.result +++ /dev/null @@ -1,70 +0,0 @@ -DROP TABLE IF EXISTS t1; -DROP TABLE IF EXISTS t2; -CREATE TABLE t2 (a INT); -INSERT INTO t2 VALUES(10); -INSERT INTO t2 VALUES(10); -INSERT INTO t2 VALUES(20); -INSERT INTO t2 VALUES(10); -INSERT INTO t2 VALUES(20); -SET DEBUG_SYNC= 'locked_table_name SIGNAL thread1_ready WAIT_FOR threads_dumped'; -CREATE TABLE t1 (a INT); -SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; -SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; -SELECT a FROM t2 WHERE a > 15; -SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -SHOW PROCESSLIST; -Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read -### root ### test Query ### ### SHOW PROCESSLIST 0 0 2 -### root ### test Query ### ### CREATE TABLE t1 (a INT) 0 0 1 -### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 2 5 6 -SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; -id info rows_sent rows_examined rows_read -### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1 -### CREATE TABLE t1 (a INT) 0 0 1 -### SELECT a FROM t2 WHERE a > 15 2 5 6 -SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; -a -20 -20 -SET DEBUG_SYNC= 'sent_row SIGNAL thread1_ready WAIT_FOR threads_dumped'; -SELECT a FROM t2 WHERE a < 15; -SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; -SET DEBUG_SYNC= 'sent_row SIGNAL thread2_ready WAIT_FOR threads_dumped'; -SELECT a FROM t2 WHERE a > 15; -SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -SHOW PROCESSLIST; -Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read -### root ### test Query ### ### SHOW PROCESSLIST 0 0 4 -### root ### test Query ### ### SELECT a FROM t2 WHERE a < 15 1 0 1 -### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 1 0 3 -SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; -id info rows_sent rows_examined rows_read -### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1 -### SELECT a FROM t2 WHERE a < 15 1 0 1 -### SELECT a FROM t2 WHERE a > 15 1 0 3 -SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; -a -10 -10 -10 -a -20 -20 -SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread1_ready WAIT_FOR threads_dumped'; -UPDATE t2 SET a = 15 WHERE a = 20; -SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; -SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; -UPDATE t2 SET a = 15 WHERE a = 10; -SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; -SHOW PROCESSLIST; -Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read -### root ### test Query ### ### SHOW PROCESSLIST 0 0 4 -### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 20 0 5 6 -### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 10 0 5 6 -SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id; -id info rows_sent rows_examined rows_read -### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1 -### UPDATE t2 SET a = 15 WHERE a = 20 0 5 6 -### UPDATE t2 SET a = 15 WHERE a = 10 0 5 6 -SET DEBUG_SYNC= 'now SIGNAL threads_dumped'; -DROP TABLES t1, t2; diff --git a/mysql-test/suite/percona/percona_processlist_row_stats.test b/mysql-test/suite/percona/percona_processlist_row_stats.test deleted file mode 100644 index 17ebfedfa40..00000000000 --- a/mysql-test/suite/percona/percona_processlist_row_stats.test +++ /dev/null @@ -1,79 +0,0 @@ -# Testing of INFORMATION_SCHEMA.PROCESSLIST fields ROWS_SENT, ROWS_EXAMINED, ROWS_READ ---source include/have_debug_sync.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; -DROP TABLE IF EXISTS t2; ---enable_warnings - -CREATE TABLE t2 (a INT); -INSERT INTO t2 VALUES(10); -INSERT INTO t2 VALUES(10); -INSERT INTO t2 VALUES(20); -INSERT INTO t2 VALUES(10); -INSERT INTO t2 VALUES(20); - ---connect (conn1, localhost, root, ,) ---connect (conn2, localhost, root, ,) - ---connection conn1 -SET DEBUG_SYNC= 'locked_table_name SIGNAL thread1_ready WAIT_FOR threads_dumped'; -send CREATE TABLE t1 (a INT); ---connection default -SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; - ---connection conn2 -SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; -send SELECT a FROM t2 WHERE a > 15; ---connection default -SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; - ---source include/percona_processlist_row_stats_show.inc - ---connection conn1 -reap; ---connection conn2 -reap; - ---connection conn1 -SET DEBUG_SYNC= 'sent_row SIGNAL thread1_ready WAIT_FOR threads_dumped'; -send SELECT a FROM t2 WHERE a < 15; ---connection default -SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; - ---connection conn2 -SET DEBUG_SYNC= 'sent_row SIGNAL thread2_ready WAIT_FOR threads_dumped'; -send SELECT a FROM t2 WHERE a > 15; ---connection default -SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; - ---source include/percona_processlist_row_stats_show.inc - ---connection conn1 -reap; ---connection conn2 -reap; - ---connection conn1 -SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread1_ready WAIT_FOR threads_dumped'; -send UPDATE t2 SET a = 15 WHERE a = 20; ---connection default -SET DEBUG_SYNC= 'now WAIT_FOR thread1_ready'; - ---connection conn2 -SET DEBUG_SYNC= 'execute_command_after_close_tables SIGNAL thread2_ready WAIT_FOR threads_dumped'; -send UPDATE t2 SET a = 15 WHERE a = 10; ---connection default -SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready'; - ---source include/percona_processlist_row_stats_show.inc - ---connection conn1 -reap; ---connection conn2 -reap; - ---connection default -disconnect conn1; -disconnect conn2; -DROP TABLES t1, t2; diff --git a/mysql-test/suite/percona/percona_query_cache_with_comments.inc.backup b/mysql-test/suite/percona/percona_query_cache_with_comments.inc.backup deleted file mode 100644 index 4b5b31e9239..00000000000 --- a/mysql-test/suite/percona/percona_query_cache_with_comments.inc.backup +++ /dev/null @@ -1,88 +0,0 @@ ---source include/percona_query_cache_with_comments_clear.inc -let $query=/* with comment first */select * from t1; -eval $query; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=# with comment first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=/* with comment first and "quote" */select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=# with comment first and "quote" -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first and "quote" -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - /* with comment and whitespaces first */select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - # with comment and whitespaces first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - -- with comment and whitespaces first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment *; - -let $query=select * /$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment with "quote" *; - -let $query=select * /$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */ -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end -; ---source include/percona_query_cache_with_comments_eval.inc diff --git a/mysql-test/suite/percona/percona_query_response_time-replication.result b/mysql-test/suite/percona/percona_query_response_time-replication.result deleted file mode 100644 index a6e88be6103..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time-replication.result +++ /dev/null @@ -1,727 +0,0 @@ -SET GLOBAL query_exec_time=0.1; -include/master-slave.inc -[connection master] -CREATE TABLE t(id INT); -SET GLOBAL query_exec_time = 0.1; -include/restart_slave.inc -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time = 0.31; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; -INSERT INTO t VALUES(1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 1 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 1 0.100000 - 0.250000 0 0.000000 - 0.500000 30 10.650000 - 1.000000 3 1.500000 - 2.000000 15 19.500000 - 4.000000 12 30.000000 - 8.000000 6 27.599997 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 1 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 1 0.100000 - 0.250000 0 0.000000 - 0.500000 30 10.650000 - 1.000000 3 1.500000 - 2.000000 15 19.500000 - 4.000000 12 30.000000 - 8.000000 6 27.599997 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP TABLE t; -CREATE TABLE t(id INT); -SET GLOBAL query_exec_time = 0.1; -include/restart_slave.inc -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time = 0.31; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; -INSERT INTO t VALUES(1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 1 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 1 0.100000 - 0.250000 0 0.000000 - 0.500000 30 10.650000 - 1.000000 3 1.500000 - 2.000000 15 19.500000 - 4.000000 12 30.000000 - 8.000000 6 27.599997 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 1 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 1 0.100000 - 0.250000 0 0.000000 - 0.500000 30 10.650000 - 1.000000 3 1.500000 - 2.000000 15 19.500000 - 4.000000 12 30.000000 - 8.000000 6 27.599997 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP TABLE t; -CREATE TABLE t(id INT); -SET GLOBAL query_exec_time = 0.1; -include/restart_slave.inc -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time = 0.31; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; -INSERT INTO t VALUES(1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 1 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 34 12.250000 - 10.000000 33 77.099997 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 1 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 34 12.250000 - 10.000000 33 77.099997 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP TABLE t; -CREATE TABLE t(id INT); -SET GLOBAL query_exec_time = 0.1; -include/restart_slave.inc -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time = 0.31; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; -INSERT INTO t VALUES(1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 1 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 1 0.100000 - 1.000000 33 12.150000 - 7.000000 33 77.099997 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 1 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 1 0.100000 - 1.000000 33 12.150000 - 7.000000 33 77.099997 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP TABLE t; -CREATE TABLE t(id INT); -SET GLOBAL query_exec_time = 0.1; -include/restart_slave.inc -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time = 0.31; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; -INSERT INTO t VALUES(1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -SHOW QUERY_RESPONSE_TIME; - - 0.000041 1 0.000000 - 0.006410 0 0.000000 - 1.000000 34 12.250000 - 156.000000 33 77.099997 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000041 1 0.000000 - 0.006410 0 0.000000 - 1.000000 34 12.250000 - 156.000000 33 77.099997 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP TABLE t; -CREATE TABLE t(id INT); -SET GLOBAL query_exec_time = 0.1; -include/restart_slave.inc -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time = 0.31; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; -INSERT INTO t VALUES(1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 1 0.000000 - 0.001000 0 0.000000 - 1.000000 34 12.250000 - 1000.000000 33 77.099997 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 1 0.000000 - 0.001000 0 0.000000 - 1.000000 34 12.250000 - 1000.000000 33 77.099997 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP TABLE t; -CREATE TABLE t(id INT); -SET GLOBAL query_exec_time = 0.1; -include/restart_slave.inc -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1001; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time = 0.31; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; -INSERT INTO t VALUES(1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 1 0.000000 - 0.001000 0 0.000000 - 1.000000 34 12.250000 - 1000.000000 33 77.099997 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 1 0.000000 - 0.001000 0 0.000000 - 1.000000 34 12.250000 - 1000.000000 33 77.099997 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP TABLE t; -include/rpl_end.inc -SET GLOBAL query_exec_time=default; -SET GLOBAL query_exec_time=default; diff --git a/mysql-test/suite/percona/percona_query_response_time-replication.test b/mysql-test/suite/percona/percona_query_response_time-replication.test deleted file mode 100644 index 1207e5d1c3d..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time-replication.test +++ /dev/null @@ -1,28 +0,0 @@ -SET GLOBAL query_exec_time=0.1; - ---source include/have_response_time_distribution.inc ---source include/have_debug.inc ---source include/have_binlog_format_statement.inc ---source include/master-slave.inc - ---let base=1 ---source include/query_response_time-replication.inc ---let base=2 ---source include/query_response_time-replication.inc ---let base=10 ---source include/query_response_time-replication.inc ---let base=7 ---source include/query_response_time-replication.inc ---let base=156 ---source include/query_response_time-replication.inc ---let base=1000 ---source include/query_response_time-replication.inc ---let base=1001 ---source include/query_response_time-replication.inc - ---source include/rpl_end.inc - -SET GLOBAL query_exec_time=default; - -connection slave; -SET GLOBAL query_exec_time=default; diff --git a/mysql-test/suite/percona/percona_query_response_time-stored.result b/mysql-test/suite/percona/percona_query_response_time-stored.result deleted file mode 100644 index fb458d6e7ab..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time-stored.result +++ /dev/null @@ -1,544 +0,0 @@ -CREATE TABLE t(a INT); -CREATE PROCEDURE test_f(t DECIMAL(3,2)) -BEGIN -SET SESSION query_exec_time=t; -INSERT INTO t VALUES(1); -SET SESSION query_exec_time=0.1; -DELETE FROM t; -END^ -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 45 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 44 4.400000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 45 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 44 4.400000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 45 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 44 4.400000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 45 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 44 4.400000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 45 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 55 8.450000 - 10.000000 11 25.699999 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 45 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 55 8.450000 - 10.000000 11 25.699999 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 45 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 44 4.400000 - 1.000000 11 4.050000 - 7.000000 11 25.699999 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 45 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 44 4.400000 - 1.000000 11 4.050000 - 7.000000 11 25.699999 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -SHOW QUERY_RESPONSE_TIME; - - 0.000041 45 0.000000 - 0.006410 0 0.000000 - 1.000000 55 8.450000 - 156.000000 11 25.699999 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000041 45 0.000000 - 0.006410 0 0.000000 - 1.000000 55 8.450000 - 156.000000 11 25.699999 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 45 0.000000 - 0.001000 0 0.000000 - 1.000000 55 8.450000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 45 0.000000 - 0.001000 0 0.000000 - 1.000000 55 8.450000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1001; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 45 0.000000 - 0.001000 0 0.000000 - 1.000000 55 8.450000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 45 0.000000 - 0.001000 0 0.000000 - 1.000000 55 8.450000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; -DROP PROCEDURE test_f; -DROP TABLE t; diff --git a/mysql-test/suite/percona/percona_query_response_time-stored.test b/mysql-test/suite/percona/percona_query_response_time-stored.test deleted file mode 100644 index 847ff223b3f..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time-stored.test +++ /dev/null @@ -1,36 +0,0 @@ ---source include/have_response_time_distribution.inc ---source include/have_debug.inc - -CREATE TABLE t(a INT); - -delimiter ^; -CREATE PROCEDURE test_f(t DECIMAL(3,2)) -BEGIN - SET SESSION query_exec_time=t; - INSERT INTO t VALUES(1); - SET SESSION query_exec_time=0.1; - DELETE FROM t; -END^ -delimiter ;^ - ---let base=1 ---source include/query_response_time-stored.inc ---let base=2 ---source include/query_response_time-stored.inc ---let base=10 ---source include/query_response_time-stored.inc ---let base=7 ---source include/query_response_time-stored.inc ---let base=156 ---source include/query_response_time-stored.inc ---let base=1000 ---source include/query_response_time-stored.inc ---let base=1001 ---source include/query_response_time-stored.inc - -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; - -DROP PROCEDURE test_f; - -DROP TABLE t; diff --git a/mysql-test/suite/percona/percona_query_response_time.result b/mysql-test/suite/percona/percona_query_response_time.result deleted file mode 100644 index 1eb90d3cdd4..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time.result +++ /dev/null @@ -1,1307 +0,0 @@ -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -FLUSH QUERY_RESPONSE_TIME; -SHOW QUERY_RESPONSE_TIME; - - 0.000001 0 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 0 0.000000 - 1.000000 0 0.000000 - 2.000000 0 0.000000 - 4.000000 0 0.000000 - 8.000000 0 0.000000 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 0 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 0 0.000000 - 1.000000 0 0.000000 - 2.000000 0 0.000000 - 4.000000 0 0.000000 - 8.000000 0 0.000000 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time=0.31; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.32; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.33; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.34; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.35; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.36; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.37; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.38; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.39; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.2; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=3.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=4.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=5.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 24 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 24 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=2; -FLUSH QUERY_RESPONSE_TIME; -SHOW QUERY_RESPONSE_TIME; - - 0.000001 0 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 0 0.000000 - 1.000000 0 0.000000 - 2.000000 0 0.000000 - 4.000000 0 0.000000 - 8.000000 0 0.000000 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 0 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 0 0.000000 - 1.000000 0 0.000000 - 2.000000 0 0.000000 - 4.000000 0 0.000000 - 8.000000 0 0.000000 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time=0.31; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.32; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.33; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.34; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.35; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.36; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.37; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.38; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.39; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.2; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=3.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=4.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=5.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 24 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 24 0.000000 - 0.000003 0 0.000000 - 0.000007 0 0.000000 - 0.000015 0 0.000000 - 0.000030 0 0.000000 - 0.000061 0 0.000000 - 0.000122 0 0.000000 - 0.000244 0 0.000000 - 0.000488 0 0.000000 - 0.000976 0 0.000000 - 0.001953 0 0.000000 - 0.003906 0 0.000000 - 0.007812 0 0.000000 - 0.015625 0 0.000000 - 0.031250 0 0.000000 - 0.062500 0 0.000000 - 0.125000 0 0.000000 - 0.250000 0 0.000000 - 0.500000 10 3.550000 - 1.000000 1 0.500000 - 2.000000 5 6.500000 - 4.000000 4 10.000000 - 8.000000 2 9.199999 - 16.000000 0 0.000000 - 32.000000 0 0.000000 - 64.000000 0 0.000000 - 128.000000 0 0.000000 - 256.000000 0 0.000000 - 512.000000 0 0.000000 - 1024.000000 0 0.000000 - 2048.000000 0 0.000000 - 4096.000000 0 0.000000 - 8192.000000 0 0.000000 - 16384.000000 0 0.000000 - 32768.000000 0 0.000000 - 65536.000000 0 0.000000 - 131072.000000 0 0.000000 - 262144.000000 0 0.000000 - 524288.000000 0 0.000000 -1048576.000000 0 0.000000 -2097152.000000 0 0.000000 -4194304.000000 0 0.000000 -8388608.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=10; -FLUSH QUERY_RESPONSE_TIME; -SHOW QUERY_RESPONSE_TIME; - - 0.000001 0 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 0 0.000000 - 10.000000 0 0.000000 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 0 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 0 0.000000 - 10.000000 0 0.000000 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time=0.31; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.32; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.33; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.34; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.35; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.36; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.37; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.38; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.39; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.2; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=3.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=4.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=5.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 24 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 11 4.050000 - 10.000000 11 25.699999 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 24 0.000000 - 0.000010 0 0.000000 - 0.000100 0 0.000000 - 0.001000 0 0.000000 - 0.010000 0 0.000000 - 0.100000 0 0.000000 - 1.000000 11 4.050000 - 10.000000 11 25.699999 - 100.000000 0 0.000000 - 1000.000000 0 0.000000 - 10000.000000 0 0.000000 - 100000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=7; -FLUSH QUERY_RESPONSE_TIME; -SHOW QUERY_RESPONSE_TIME; - - 0.000001 0 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 0 0.000000 - 1.000000 0 0.000000 - 7.000000 0 0.000000 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 0 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 0 0.000000 - 1.000000 0 0.000000 - 7.000000 0 0.000000 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time=0.31; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.32; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.33; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.34; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.35; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.36; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.37; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.38; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.39; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.2; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=3.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=4.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=5.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 24 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 0 0.000000 - 1.000000 11 4.050000 - 7.000000 11 25.699999 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 24 0.000000 - 0.000008 0 0.000000 - 0.000059 0 0.000000 - 0.000416 0 0.000000 - 0.002915 0 0.000000 - 0.020408 0 0.000000 - 0.142857 0 0.000000 - 1.000000 11 4.050000 - 7.000000 11 25.699999 - 49.000000 0 0.000000 - 343.000000 0 0.000000 - 2401.000000 0 0.000000 - 16807.000000 0 0.000000 - 117649.000000 0 0.000000 - 823543.000000 0 0.000000 -5764801.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=156; -FLUSH QUERY_RESPONSE_TIME; -SHOW QUERY_RESPONSE_TIME; - - 0.000041 0 0.000000 - 0.006410 0 0.000000 - 1.000000 0 0.000000 - 156.000000 0 0.000000 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000041 0 0.000000 - 0.006410 0 0.000000 - 1.000000 0 0.000000 - 156.000000 0 0.000000 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time=0.31; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.32; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.33; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.34; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.35; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.36; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.37; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.38; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.39; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.2; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=3.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=4.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=5.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -SHOW QUERY_RESPONSE_TIME; - - 0.000041 24 0.000000 - 0.006410 0 0.000000 - 1.000000 11 4.050000 - 156.000000 11 25.699999 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000041 24 0.000000 - 0.006410 0 0.000000 - 1.000000 11 4.050000 - 156.000000 11 25.699999 - 24336.000000 0 0.000000 -3796416.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1000; -FLUSH QUERY_RESPONSE_TIME; -SHOW QUERY_RESPONSE_TIME; - - 0.000001 0 0.000000 - 0.001000 0 0.000000 - 1.000000 0 0.000000 - 1000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 0 0.000000 - 0.001000 0 0.000000 - 1.000000 0 0.000000 - 1000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time=0.31; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.32; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.33; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.34; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.35; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.36; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.37; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.38; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.39; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.2; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=3.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=4.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=5.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 24 0.000000 - 0.001000 0 0.000000 - 1.000000 11 4.050000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 24 0.000000 - 0.001000 0 0.000000 - 1.000000 11 4.050000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=1001; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' -FLUSH QUERY_RESPONSE_TIME; -SHOW QUERY_RESPONSE_TIME; - - 0.000001 0 0.000000 - 0.001000 0 0.000000 - 1.000000 0 0.000000 - 1000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 0 0.000000 - 0.001000 0 0.000000 - 1.000000 0 0.000000 - 1000.000000 0 0.000000 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; -SET SESSION query_exec_time=0.31; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.32; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.33; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.34; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.35; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.36; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.37; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.38; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.39; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.2; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=1.4; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.3; -SELECT 1; -1 -1 -SET SESSION query_exec_time=2.5; -SELECT 1; -1 -1 -SET SESSION query_exec_time=3.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=4.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=5.1; -SELECT 1; -1 -1 -SET SESSION query_exec_time=0.1; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SHOW QUERY_RESPONSE_TIME; - - 0.000001 24 0.000000 - 0.001000 0 0.000000 - 1.000000 11 4.050000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time count total - 0.000001 24 0.000000 - 0.001000 0 0.000000 - 1.000000 11 4.050000 - 1000.000000 11 25.699999 -1000000.000000 0 0.000000 -TOO LONG 0 TOO LONG -SET SESSION query_exec_time=default; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; diff --git a/mysql-test/suite/percona/percona_query_response_time.test b/mysql-test/suite/percona/percona_query_response_time.test deleted file mode 100644 index d4fb9c61388..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time.test +++ /dev/null @@ -1,20 +0,0 @@ ---source include/have_response_time_distribution.inc ---source include/have_debug.inc - ---let base=1 ---source include/query_response_time.inc ---let base=2 ---source include/query_response_time.inc ---let base=10 ---source include/query_response_time.inc ---let base=7 ---source include/query_response_time.inc ---let base=156 ---source include/query_response_time.inc ---let base=1000 ---source include/query_response_time.inc ---let base=1001 ---source include/query_response_time.inc - -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; diff --git a/mysql-test/suite/percona/percona_query_response_time_flush.inc b/mysql-test/suite/percona/percona_query_response_time_flush.inc deleted file mode 100644 index 44bb320fe13..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time_flush.inc +++ /dev/null @@ -1 +0,0 @@ -FLUSH QUERY_RESPONSE_TIME; diff --git a/mysql-test/suite/percona/percona_query_response_time_show.inc b/mysql-test/suite/percona/percona_query_response_time_show.inc deleted file mode 100644 index 709abf9872e..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time_show.inc +++ /dev/null @@ -1,8 +0,0 @@ -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; diff --git a/mysql-test/suite/percona/percona_query_response_time_sleep.inc b/mysql-test/suite/percona/percona_query_response_time_sleep.inc deleted file mode 100644 index d889fd9f98d..00000000000 --- a/mysql-test/suite/percona/percona_query_response_time_sleep.inc +++ /dev/null @@ -1,19 +0,0 @@ -SET SESSION debug="+d,query_exec_time_0.31"; -SET SESSION debug="+d,query_exec_time_0.32"; -SET SESSION debug="+d,query_exec_time_0.33"; -SET SESSION debug="+d,query_exec_time_0.34"; -SET SESSION debug="+d,query_exec_time_0.35"; -SET SESSION debug="+d,query_exec_time_0.36"; -SET SESSION debug="+d,query_exec_time_0.37"; -SET SESSION debug="+d,query_exec_time_0.38"; -SET SESSION debug="+d,query_exec_time_0.39"; -SET SESSION debug="+d,query_exec_time_0.4"; -SET SESSION debug="+d,query_exec_time_1.1"; -SET SESSION debug="+d,query_exec_time_1.2"; -SET SESSION debug="+d,query_exec_time_1.3"; -SET SESSION debug="+d,query_exec_time_1.5"; -SET SESSION debug="+d,query_exec_time_1.4"; -SET SESSION debug="+d,query_exec_time_0.5"; -SET SESSION debug="+d,query_exec_time_2.1"; -SET SESSION debug="+d,query_exec_time_2.3"; -SET SESSION debug="+d,query_exec_time_2.5"; diff --git a/mysql-test/suite/percona/percona_server_variables.inc b/mysql-test/suite/percona/percona_server_variables.inc deleted file mode 100644 index 60c8e0ba759..00000000000 --- a/mysql-test/suite/percona/percona_server_variables.inc +++ /dev/null @@ -1,3 +0,0 @@ ---source have_response_time_distribution.inc ---source include/have_xtradb.inc -SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1; diff --git a/mysql-test/suite/percona/percona_server_variables_debug.result b/mysql-test/suite/percona/percona_server_variables_debug.result deleted file mode 100644 index ae02a48c8fa..00000000000 --- a/mysql-test/suite/percona/percona_server_variables_debug.result +++ /dev/null @@ -1,382 +0,0 @@ -SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1; -Variable_name -AUTOCOMMIT -AUTOMATIC_SP_PRIVILEGES -AUTO_INCREMENT_INCREMENT -AUTO_INCREMENT_OFFSET -BACK_LOG -BASEDIR -BIG_TABLES -BINLOG_CACHE_SIZE -BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES -BINLOG_FORMAT -BINLOG_STMT_CACHE_SIZE -BULK_INSERT_BUFFER_SIZE -CHARACTER_SETS_DIR -CHARACTER_SET_CLIENT -CHARACTER_SET_CONNECTION -CHARACTER_SET_DATABASE -CHARACTER_SET_FILESYSTEM -CHARACTER_SET_RESULTS -CHARACTER_SET_SERVER -CHARACTER_SET_SYSTEM -COLLATION_CONNECTION -COLLATION_DATABASE -COLLATION_SERVER -COMPLETION_TYPE -CONCURRENT_INSERT -CONNECT_TIMEOUT -DATADIR -DATETIME_FORMAT -DATE_FORMAT -DEBUG -DEBUG_SYNC -DEFAULT_STORAGE_ENGINE -DEFAULT_WEEK_FORMAT -DELAYED_INSERT_LIMIT -DELAYED_INSERT_TIMEOUT -DELAYED_QUEUE_SIZE -DELAY_KEY_WRITE -DIV_PRECISION_INCREMENT -ENGINE_CONDITION_PUSHDOWN -ERROR_COUNT -EVENT_SCHEDULER -EXPAND_FAST_INDEX_CREATION -EXPIRE_LOGS_DAYS -EXTERNAL_USER -FAST_INDEX_CREATION -FLUSH -FLUSH_TIME -FOREIGN_KEY_CHECKS -FT_BOOLEAN_SYNTAX -FT_MAX_WORD_LEN -FT_MIN_WORD_LEN -FT_QUERY_EXPANSION_LIMIT -FT_STOPWORD_FILE -GENERAL_LOG -GENERAL_LOG_FILE -GROUP_CONCAT_MAX_LEN -HAVE_COMPRESS -HAVE_CRYPT -HAVE_CSV -HAVE_DYNAMIC_LOADING -HAVE_GEOMETRY -HAVE_INNODB -HAVE_NDBCLUSTER -HAVE_OPENSSL -HAVE_PARTITIONING -HAVE_PROFILING -HAVE_QUERY_CACHE -HAVE_RESPONSE_TIME_DISTRIBUTION -HAVE_RTREE_KEYS -HAVE_SSL -HAVE_SYMLINK -HOSTNAME -IDENTITY -IGNORE_BUILTIN_INNODB -INIT_CONNECT -INIT_FILE -INIT_SLAVE -INNODB_ADAPTIVE_FLUSHING -INNODB_ADAPTIVE_FLUSHING_METHOD -INNODB_ADAPTIVE_HASH_INDEX -INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS -INNODB_ADDITIONAL_MEM_POOL_SIZE -INNODB_AUTOEXTEND_INCREMENT -INNODB_AUTOINC_LOCK_MODE -INNODB_BLOCKING_BUFFER_POOL_RESTORE -INNODB_BUFFER_POOL_INSTANCES -INNODB_BUFFER_POOL_RESTORE_AT_STARTUP -INNODB_BUFFER_POOL_SHM_CHECKSUM -INNODB_BUFFER_POOL_SHM_KEY -INNODB_BUFFER_POOL_SIZE -INNODB_CHANGE_BUFFERING -INNODB_CHANGE_BUFFERING_DEBUG -INNODB_CHECKPOINT_AGE_TARGET -INNODB_CHECKSUMS -INNODB_COMMIT_CONCURRENCY -INNODB_CONCURRENCY_TICKETS -INNODB_CORRUPT_TABLE_ACTION -INNODB_DATA_FILE_PATH -INNODB_DATA_HOME_DIR -INNODB_DICT_SIZE_LIMIT -INNODB_DOUBLEWRITE -INNODB_DOUBLEWRITE_FILE -INNODB_FAKE_CHANGES -INNODB_FAST_CHECKSUM -INNODB_FAST_SHUTDOWN -INNODB_FILE_FORMAT -INNODB_FILE_FORMAT_CHECK -INNODB_FILE_FORMAT_MAX -INNODB_FILE_PER_TABLE -INNODB_FLUSH_CHECKPOINT_DEBUG -INNODB_FLUSH_LOG_AT_TRX_COMMIT -INNODB_FLUSH_METHOD -INNODB_FLUSH_NEIGHBOR_PAGES -INNODB_FORCE_LOAD_CORRUPTED -INNODB_FORCE_RECOVERY -INNODB_IBUF_ACCEL_RATE -INNODB_IBUF_ACTIVE_CONTRACT -INNODB_IBUF_MAX_SIZE -INNODB_IMPORT_TABLE_FROM_XTRABACKUP -INNODB_IO_CAPACITY -INNODB_KILL_IDLE_TRANSACTION -INNODB_LARGE_PREFIX -INNODB_LAZY_DROP_TABLE -INNODB_LOCKS_UNSAFE_FOR_BINLOG -INNODB_LOCK_WAIT_TIMEOUT -INNODB_LOG_BLOCK_SIZE -INNODB_LOG_BUFFER_SIZE -INNODB_LOG_FILES_IN_GROUP -INNODB_LOG_FILE_SIZE -INNODB_LOG_GROUP_HOME_DIR -INNODB_MAX_DIRTY_PAGES_PCT -INNODB_MAX_PURGE_LAG -INNODB_MIRRORED_LOG_GROUPS -INNODB_OLD_BLOCKS_PCT -INNODB_OLD_BLOCKS_TIME -INNODB_OPEN_FILES -INNODB_PAGE_SIZE -INNODB_PURGE_BATCH_SIZE -INNODB_PURGE_THREADS -INNODB_RANDOM_READ_AHEAD -INNODB_READ_AHEAD -INNODB_READ_AHEAD_THRESHOLD -INNODB_READ_IO_THREADS -INNODB_RECOVERY_STATS -INNODB_RECOVERY_UPDATE_RELAY_LOG -INNODB_REPLICATION_DELAY -INNODB_ROLLBACK_ON_TIMEOUT -INNODB_ROLLBACK_SEGMENTS -INNODB_SHOW_LOCKS_HELD -INNODB_SHOW_VERBOSE_LOCKS -INNODB_SPIN_WAIT_DELAY -INNODB_STATS_AUTO_UPDATE -INNODB_STATS_METHOD -INNODB_STATS_ON_METADATA -INNODB_STATS_SAMPLE_PAGES -INNODB_STATS_UPDATE_NEED_LOCK -INNODB_STRICT_MODE -INNODB_SUPPORT_XA -INNODB_SYNC_SPIN_LOOPS -INNODB_TABLE_LOCKS -INNODB_THREAD_CONCURRENCY -INNODB_THREAD_CONCURRENCY_TIMER_BASED -INNODB_THREAD_SLEEP_DELAY -INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT -INNODB_USE_NATIVE_AIO -INNODB_USE_SYS_MALLOC -INNODB_USE_SYS_STATS_TABLE -INNODB_VERSION -INNODB_WRITE_IO_THREADS -INSERT_ID -INTERACTIVE_TIMEOUT -JOIN_BUFFER_SIZE -KEEP_FILES_ON_CREATE -KEY_BUFFER_SIZE -KEY_CACHE_AGE_THRESHOLD -KEY_CACHE_BLOCK_SIZE -KEY_CACHE_DIVISION_LIMIT -LARGE_FILES_SUPPORT -LARGE_PAGES -LARGE_PAGE_SIZE -LAST_INSERT_ID -LC_MESSAGES -LC_MESSAGES_DIR -LC_TIME_NAMES -LICENSE -LOCAL_INFILE -LOCKED_IN_MEMORY -LOCK_WAIT_TIMEOUT -LOG -LOG_BIN -LOG_BIN_TRUST_FUNCTION_CREATORS -LOG_ERROR -LOG_OUTPUT -LOG_QUERIES_NOT_USING_INDEXES -LOG_SLAVE_UPDATES -LOG_SLOW_ADMIN_STATEMENTS -LOG_SLOW_FILTER -LOG_SLOW_QUERIES -LOG_SLOW_RATE_LIMIT -LOG_SLOW_SLAVE_STATEMENTS -LOG_SLOW_SP_STATEMENTS -LOG_SLOW_VERBOSITY -LOG_WARNINGS -LOG_WARNINGS_SUPPRESS -LONG_QUERY_TIME -LOWER_CASE_FILE_SYSTEM -LOWER_CASE_TABLE_NAMES -LOW_PRIORITY_UPDATES -MAX_ALLOWED_PACKET -MAX_BINLOG_CACHE_SIZE -MAX_BINLOG_SIZE -MAX_BINLOG_STMT_CACHE_SIZE -MAX_CONNECTIONS -MAX_CONNECT_ERRORS -MAX_DELAYED_THREADS -MAX_ERROR_COUNT -MAX_HEAP_TABLE_SIZE -MAX_INSERT_DELAYED_THREADS -MAX_JOIN_SIZE -MAX_LENGTH_FOR_SORT_DATA -MAX_LONG_DATA_SIZE -MAX_PREPARED_STMT_COUNT -MAX_RELAY_LOG_SIZE -MAX_SEEKS_FOR_KEY -MAX_SORT_LENGTH -MAX_SP_RECURSION_DEPTH -MAX_TMP_TABLES -MAX_USER_CONNECTIONS -MAX_WRITE_LOCK_COUNT -METADATA_LOCKS_CACHE_SIZE -MIN_EXAMINED_ROW_LIMIT -MULTI_RANGE_COUNT -MYISAM_DATA_POINTER_SIZE -MYISAM_MAX_SORT_FILE_SIZE -MYISAM_MMAP_SIZE -MYISAM_RECOVER_OPTIONS -MYISAM_REPAIR_THREADS -MYISAM_SORT_BUFFER_SIZE -MYISAM_STATS_METHOD -MYISAM_USE_MMAP -NET_BUFFER_LENGTH -NET_READ_TIMEOUT -NET_RETRY_COUNT -NET_WRITE_TIMEOUT -NEW -OLD -OLD_ALTER_TABLE -OLD_PASSWORDS -OPEN_FILES_LIMIT -OPTIMIZER_FIX -OPTIMIZER_PRUNE_LEVEL -OPTIMIZER_SEARCH_DEPTH -OPTIMIZER_SWITCH -PERFORMANCE_SCHEMA -PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE -PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE -PERFORMANCE_SCHEMA_MAX_COND_CLASSES -PERFORMANCE_SCHEMA_MAX_COND_INSTANCES -PERFORMANCE_SCHEMA_MAX_FILE_CLASSES -PERFORMANCE_SCHEMA_MAX_FILE_HANDLES -PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES -PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES -PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES -PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES -PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES -PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES -PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES -PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES -PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES -PID_FILE -PLUGIN_DIR -PORT -PRELOAD_BUFFER_SIZE -PROFILING -PROFILING_HISTORY_SIZE -PROTOCOL_VERSION -PROXY_USER -PSEUDO_THREAD_ID -QUERY_ALLOC_BLOCK_SIZE -QUERY_CACHE_LIMIT -QUERY_CACHE_MIN_RES_UNIT -QUERY_CACHE_SIZE -QUERY_CACHE_STRIP_COMMENTS -QUERY_CACHE_TYPE -QUERY_CACHE_WLOCK_INVALIDATE -QUERY_EXEC_TIME -QUERY_PREALLOC_SIZE -QUERY_RESPONSE_TIME_RANGE_BASE -QUERY_RESPONSE_TIME_STATS -RAND_SEED1 -RAND_SEED2 -RANGE_ALLOC_BLOCK_SIZE -READ_BUFFER_SIZE -READ_ONLY -READ_RND_BUFFER_SIZE -RELAY_LOG -RELAY_LOG_INDEX -RELAY_LOG_INFO_FILE -RELAY_LOG_PURGE -RELAY_LOG_RECOVERY -RELAY_LOG_SPACE_LIMIT -REPORT_HOST -REPORT_PASSWORD -REPORT_PORT -REPORT_USER -RPL_RECOVERY_RANK -SECURE_AUTH -SECURE_FILE_PRIV -SERVER_ID -SKIP_EXTERNAL_LOCKING -SKIP_NAME_RESOLVE -SKIP_NETWORKING -SKIP_SHOW_DATABASE -SLAVE_COMPRESSED_PROTOCOL -SLAVE_EXEC_MODE -SLAVE_LOAD_TMPDIR -SLAVE_NET_TIMEOUT -SLAVE_SKIP_ERRORS -SLAVE_TRANSACTION_RETRIES -SLAVE_TYPE_CONVERSIONS -SLOW_LAUNCH_TIME -SLOW_QUERY_LOG -SLOW_QUERY_LOG_FILE -SLOW_QUERY_LOG_TIMESTAMP_ALWAYS -SLOW_QUERY_LOG_TIMESTAMP_PRECISION -SLOW_QUERY_LOG_USE_GLOBAL_CONTROL -SOCKET -SORT_BUFFER_SIZE -SQL_AUTO_IS_NULL -SQL_BIG_SELECTS -SQL_BIG_TABLES -SQL_BUFFER_RESULT -SQL_LOG_BIN -SQL_LOG_OFF -SQL_LOW_PRIORITY_UPDATES -SQL_MAX_JOIN_SIZE -SQL_MODE -SQL_NOTES -SQL_QUOTE_SHOW_CREATE -SQL_SAFE_UPDATES -SQL_SELECT_LIMIT -SQL_SLAVE_SKIP_COUNTER -SQL_WARNINGS -SSL_CA -SSL_CAPATH -SSL_CERT -SSL_CIPHER -SSL_KEY -STORAGE_ENGINE -SYNC_BINLOG -SYNC_FRM -SYNC_MASTER_INFO -SYNC_RELAY_LOG -SYNC_RELAY_LOG_INFO -SYSTEM_TIME_ZONE -TABLE_DEFINITION_CACHE -TABLE_OPEN_CACHE -THREAD_CACHE_SIZE -THREAD_CONCURRENCY -THREAD_HANDLING -THREAD_STACK -THREAD_STATISTICS -TIMED_MUTEXES -TIMESTAMP -TIME_FORMAT -TIME_ZONE -TMPDIR -TMP_TABLE_SIZE -TRANSACTION_ALLOC_BLOCK_SIZE -TRANSACTION_PREALLOC_SIZE -TX_ISOLATION -UNIQUE_CHECKS -UPDATABLE_VIEWS_WITH_LIMIT -USERSTAT -VERSION -VERSION_COMMENT -VERSION_COMPILE_MACHINE -VERSION_COMPILE_OS -WAIT_TIMEOUT -WARNING_COUNT diff --git a/mysql-test/suite/percona/percona_server_variables_debug.test b/mysql-test/suite/percona/percona_server_variables_debug.test deleted file mode 100644 index 971f6bae689..00000000000 --- a/mysql-test/suite/percona/percona_server_variables_debug.test +++ /dev/null @@ -1,2 +0,0 @@ ---source include/have_debug.inc ---source percona_server_variables.inc diff --git a/mysql-test/suite/percona/percona_server_variables_release.result b/mysql-test/suite/percona/percona_server_variables_release.result deleted file mode 100644 index 29ac402c144..00000000000 --- a/mysql-test/suite/percona/percona_server_variables_release.result +++ /dev/null @@ -1,377 +0,0 @@ -SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1; -Variable_name -AUTOCOMMIT -AUTOMATIC_SP_PRIVILEGES -AUTO_INCREMENT_INCREMENT -AUTO_INCREMENT_OFFSET -BACK_LOG -BASEDIR -BIG_TABLES -BINLOG_CACHE_SIZE -BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES -BINLOG_FORMAT -BINLOG_STMT_CACHE_SIZE -BULK_INSERT_BUFFER_SIZE -CHARACTER_SETS_DIR -CHARACTER_SET_CLIENT -CHARACTER_SET_CONNECTION -CHARACTER_SET_DATABASE -CHARACTER_SET_FILESYSTEM -CHARACTER_SET_RESULTS -CHARACTER_SET_SERVER -CHARACTER_SET_SYSTEM -COLLATION_CONNECTION -COLLATION_DATABASE -COLLATION_SERVER -COMPLETION_TYPE -CONCURRENT_INSERT -CONNECT_TIMEOUT -DATADIR -DATETIME_FORMAT -DATE_FORMAT -DEFAULT_STORAGE_ENGINE -DEFAULT_WEEK_FORMAT -DELAYED_INSERT_LIMIT -DELAYED_INSERT_TIMEOUT -DELAYED_QUEUE_SIZE -DELAY_KEY_WRITE -DIV_PRECISION_INCREMENT -ENGINE_CONDITION_PUSHDOWN -ERROR_COUNT -EVENT_SCHEDULER -EXPAND_FAST_INDEX_CREATION -EXPIRE_LOGS_DAYS -EXTERNAL_USER -FAST_INDEX_CREATION -FLUSH -FLUSH_TIME -FOREIGN_KEY_CHECKS -FT_BOOLEAN_SYNTAX -FT_MAX_WORD_LEN -FT_MIN_WORD_LEN -FT_QUERY_EXPANSION_LIMIT -FT_STOPWORD_FILE -GENERAL_LOG -GENERAL_LOG_FILE -GROUP_CONCAT_MAX_LEN -HAVE_COMPRESS -HAVE_CRYPT -HAVE_CSV -HAVE_DYNAMIC_LOADING -HAVE_GEOMETRY -HAVE_INNODB -HAVE_NDBCLUSTER -HAVE_OPENSSL -HAVE_PARTITIONING -HAVE_PROFILING -HAVE_QUERY_CACHE -HAVE_RESPONSE_TIME_DISTRIBUTION -HAVE_RTREE_KEYS -HAVE_SSL -HAVE_SYMLINK -HOSTNAME -IDENTITY -IGNORE_BUILTIN_INNODB -INIT_CONNECT -INIT_FILE -INIT_SLAVE -INNODB_ADAPTIVE_FLUSHING -INNODB_ADAPTIVE_FLUSHING_METHOD -INNODB_ADAPTIVE_HASH_INDEX -INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS -INNODB_ADDITIONAL_MEM_POOL_SIZE -INNODB_AUTOEXTEND_INCREMENT -INNODB_AUTOINC_LOCK_MODE -INNODB_BLOCKING_BUFFER_POOL_RESTORE -INNODB_BUFFER_POOL_INSTANCES -INNODB_BUFFER_POOL_RESTORE_AT_STARTUP -INNODB_BUFFER_POOL_SHM_CHECKSUM -INNODB_BUFFER_POOL_SHM_KEY -INNODB_BUFFER_POOL_SIZE -INNODB_CHANGE_BUFFERING -INNODB_CHECKPOINT_AGE_TARGET -INNODB_CHECKSUMS -INNODB_COMMIT_CONCURRENCY -INNODB_CONCURRENCY_TICKETS -INNODB_CORRUPT_TABLE_ACTION -INNODB_DATA_FILE_PATH -INNODB_DATA_HOME_DIR -INNODB_DICT_SIZE_LIMIT -INNODB_DOUBLEWRITE -INNODB_DOUBLEWRITE_FILE -INNODB_FAKE_CHANGES -INNODB_FAST_CHECKSUM -INNODB_FAST_SHUTDOWN -INNODB_FILE_FORMAT -INNODB_FILE_FORMAT_CHECK -INNODB_FILE_FORMAT_MAX -INNODB_FILE_PER_TABLE -INNODB_FLUSH_LOG_AT_TRX_COMMIT -INNODB_FLUSH_METHOD -INNODB_FLUSH_NEIGHBOR_PAGES -INNODB_FORCE_LOAD_CORRUPTED -INNODB_FORCE_RECOVERY -INNODB_IBUF_ACCEL_RATE -INNODB_IBUF_ACTIVE_CONTRACT -INNODB_IBUF_MAX_SIZE -INNODB_IMPORT_TABLE_FROM_XTRABACKUP -INNODB_IO_CAPACITY -INNODB_KILL_IDLE_TRANSACTION -INNODB_LARGE_PREFIX -INNODB_LAZY_DROP_TABLE -INNODB_LOCKS_UNSAFE_FOR_BINLOG -INNODB_LOCK_WAIT_TIMEOUT -INNODB_LOG_BLOCK_SIZE -INNODB_LOG_BUFFER_SIZE -INNODB_LOG_FILES_IN_GROUP -INNODB_LOG_FILE_SIZE -INNODB_LOG_GROUP_HOME_DIR -INNODB_MAX_DIRTY_PAGES_PCT -INNODB_MAX_PURGE_LAG -INNODB_MIRRORED_LOG_GROUPS -INNODB_OLD_BLOCKS_PCT -INNODB_OLD_BLOCKS_TIME -INNODB_OPEN_FILES -INNODB_PAGE_SIZE -INNODB_PURGE_BATCH_SIZE -INNODB_PURGE_THREADS -INNODB_RANDOM_READ_AHEAD -INNODB_READ_AHEAD -INNODB_READ_AHEAD_THRESHOLD -INNODB_READ_IO_THREADS -INNODB_RECOVERY_STATS -INNODB_RECOVERY_UPDATE_RELAY_LOG -INNODB_REPLICATION_DELAY -INNODB_ROLLBACK_ON_TIMEOUT -INNODB_ROLLBACK_SEGMENTS -INNODB_SHOW_LOCKS_HELD -INNODB_SHOW_VERBOSE_LOCKS -INNODB_SPIN_WAIT_DELAY -INNODB_STATS_AUTO_UPDATE -INNODB_STATS_METHOD -INNODB_STATS_ON_METADATA -INNODB_STATS_SAMPLE_PAGES -INNODB_STATS_UPDATE_NEED_LOCK -INNODB_STRICT_MODE -INNODB_SUPPORT_XA -INNODB_SYNC_SPIN_LOOPS -INNODB_TABLE_LOCKS -INNODB_THREAD_CONCURRENCY -INNODB_THREAD_CONCURRENCY_TIMER_BASED -INNODB_THREAD_SLEEP_DELAY -INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT -INNODB_USE_NATIVE_AIO -INNODB_USE_SYS_MALLOC -INNODB_USE_SYS_STATS_TABLE -INNODB_VERSION -INNODB_WRITE_IO_THREADS -INSERT_ID -INTERACTIVE_TIMEOUT -JOIN_BUFFER_SIZE -KEEP_FILES_ON_CREATE -KEY_BUFFER_SIZE -KEY_CACHE_AGE_THRESHOLD -KEY_CACHE_BLOCK_SIZE -KEY_CACHE_DIVISION_LIMIT -LARGE_FILES_SUPPORT -LARGE_PAGES -LARGE_PAGE_SIZE -LAST_INSERT_ID -LC_MESSAGES -LC_MESSAGES_DIR -LC_TIME_NAMES -LICENSE -LOCAL_INFILE -LOCKED_IN_MEMORY -LOCK_WAIT_TIMEOUT -LOG -LOG_BIN -LOG_BIN_TRUST_FUNCTION_CREATORS -LOG_ERROR -LOG_OUTPUT -LOG_QUERIES_NOT_USING_INDEXES -LOG_SLAVE_UPDATES -LOG_SLOW_ADMIN_STATEMENTS -LOG_SLOW_FILTER -LOG_SLOW_QUERIES -LOG_SLOW_RATE_LIMIT -LOG_SLOW_SLAVE_STATEMENTS -LOG_SLOW_SP_STATEMENTS -LOG_SLOW_VERBOSITY -LOG_WARNINGS -LOG_WARNINGS_SUPPRESS -LONG_QUERY_TIME -LOWER_CASE_FILE_SYSTEM -LOWER_CASE_TABLE_NAMES -LOW_PRIORITY_UPDATES -MAX_ALLOWED_PACKET -MAX_BINLOG_CACHE_SIZE -MAX_BINLOG_SIZE -MAX_BINLOG_STMT_CACHE_SIZE -MAX_CONNECTIONS -MAX_CONNECT_ERRORS -MAX_DELAYED_THREADS -MAX_ERROR_COUNT -MAX_HEAP_TABLE_SIZE -MAX_INSERT_DELAYED_THREADS -MAX_JOIN_SIZE -MAX_LENGTH_FOR_SORT_DATA -MAX_LONG_DATA_SIZE -MAX_PREPARED_STMT_COUNT -MAX_RELAY_LOG_SIZE -MAX_SEEKS_FOR_KEY -MAX_SORT_LENGTH -MAX_SP_RECURSION_DEPTH -MAX_TMP_TABLES -MAX_USER_CONNECTIONS -MAX_WRITE_LOCK_COUNT -METADATA_LOCKS_CACHE_SIZE -MIN_EXAMINED_ROW_LIMIT -MULTI_RANGE_COUNT -MYISAM_DATA_POINTER_SIZE -MYISAM_MAX_SORT_FILE_SIZE -MYISAM_MMAP_SIZE -MYISAM_RECOVER_OPTIONS -MYISAM_REPAIR_THREADS -MYISAM_SORT_BUFFER_SIZE -MYISAM_STATS_METHOD -MYISAM_USE_MMAP -NET_BUFFER_LENGTH -NET_READ_TIMEOUT -NET_RETRY_COUNT -NET_WRITE_TIMEOUT -NEW -OLD -OLD_ALTER_TABLE -OLD_PASSWORDS -OPEN_FILES_LIMIT -OPTIMIZER_FIX -OPTIMIZER_PRUNE_LEVEL -OPTIMIZER_SEARCH_DEPTH -OPTIMIZER_SWITCH -PERFORMANCE_SCHEMA -PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE -PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE -PERFORMANCE_SCHEMA_MAX_COND_CLASSES -PERFORMANCE_SCHEMA_MAX_COND_INSTANCES -PERFORMANCE_SCHEMA_MAX_FILE_CLASSES -PERFORMANCE_SCHEMA_MAX_FILE_HANDLES -PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES -PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES -PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES -PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES -PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES -PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES -PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES -PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES -PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES -PID_FILE -PLUGIN_DIR -PORT -PRELOAD_BUFFER_SIZE -PROFILING -PROFILING_HISTORY_SIZE -PROTOCOL_VERSION -PROXY_USER -PSEUDO_THREAD_ID -QUERY_ALLOC_BLOCK_SIZE -QUERY_CACHE_LIMIT -QUERY_CACHE_MIN_RES_UNIT -QUERY_CACHE_SIZE -QUERY_CACHE_STRIP_COMMENTS -QUERY_CACHE_TYPE -QUERY_CACHE_WLOCK_INVALIDATE -QUERY_PREALLOC_SIZE -QUERY_RESPONSE_TIME_RANGE_BASE -QUERY_RESPONSE_TIME_STATS -RAND_SEED1 -RAND_SEED2 -RANGE_ALLOC_BLOCK_SIZE -READ_BUFFER_SIZE -READ_ONLY -READ_RND_BUFFER_SIZE -RELAY_LOG -RELAY_LOG_INDEX -RELAY_LOG_INFO_FILE -RELAY_LOG_PURGE -RELAY_LOG_RECOVERY -RELAY_LOG_SPACE_LIMIT -REPORT_HOST -REPORT_PASSWORD -REPORT_PORT -REPORT_USER -RPL_RECOVERY_RANK -SECURE_AUTH -SECURE_FILE_PRIV -SERVER_ID -SKIP_EXTERNAL_LOCKING -SKIP_NAME_RESOLVE -SKIP_NETWORKING -SKIP_SHOW_DATABASE -SLAVE_COMPRESSED_PROTOCOL -SLAVE_EXEC_MODE -SLAVE_LOAD_TMPDIR -SLAVE_NET_TIMEOUT -SLAVE_SKIP_ERRORS -SLAVE_TRANSACTION_RETRIES -SLAVE_TYPE_CONVERSIONS -SLOW_LAUNCH_TIME -SLOW_QUERY_LOG -SLOW_QUERY_LOG_FILE -SLOW_QUERY_LOG_TIMESTAMP_ALWAYS -SLOW_QUERY_LOG_TIMESTAMP_PRECISION -SLOW_QUERY_LOG_USE_GLOBAL_CONTROL -SOCKET -SORT_BUFFER_SIZE -SQL_AUTO_IS_NULL -SQL_BIG_SELECTS -SQL_BIG_TABLES -SQL_BUFFER_RESULT -SQL_LOG_BIN -SQL_LOG_OFF -SQL_LOW_PRIORITY_UPDATES -SQL_MAX_JOIN_SIZE -SQL_MODE -SQL_NOTES -SQL_QUOTE_SHOW_CREATE -SQL_SAFE_UPDATES -SQL_SELECT_LIMIT -SQL_SLAVE_SKIP_COUNTER -SQL_WARNINGS -SSL_CA -SSL_CAPATH -SSL_CERT -SSL_CIPHER -SSL_KEY -STORAGE_ENGINE -SYNC_BINLOG -SYNC_FRM -SYNC_MASTER_INFO -SYNC_RELAY_LOG -SYNC_RELAY_LOG_INFO -SYSTEM_TIME_ZONE -TABLE_DEFINITION_CACHE -TABLE_OPEN_CACHE -THREAD_CACHE_SIZE -THREAD_CONCURRENCY -THREAD_HANDLING -THREAD_STACK -THREAD_STATISTICS -TIMED_MUTEXES -TIMESTAMP -TIME_FORMAT -TIME_ZONE -TMPDIR -TMP_TABLE_SIZE -TRANSACTION_ALLOC_BLOCK_SIZE -TRANSACTION_PREALLOC_SIZE -TX_ISOLATION -UNIQUE_CHECKS -UPDATABLE_VIEWS_WITH_LIMIT -USERSTAT -VERSION -VERSION_COMMENT -VERSION_COMPILE_MACHINE -VERSION_COMPILE_OS -WAIT_TIMEOUT -WARNING_COUNT diff --git a/mysql-test/suite/percona/percona_server_variables_release.test b/mysql-test/suite/percona/percona_server_variables_release.test deleted file mode 100644 index 6427045864c..00000000000 --- a/mysql-test/suite/percona/percona_server_variables_release.test +++ /dev/null @@ -1,2 +0,0 @@ ---source include/not_debug.inc ---source percona_server_variables.inc diff --git a/mysql-test/suite/percona/percona_show_temp_tables.result b/mysql-test/suite/percona/percona_show_temp_tables.result deleted file mode 100644 index cbcb0331896..00000000000 --- a/mysql-test/suite/percona/percona_show_temp_tables.result +++ /dev/null @@ -1,58 +0,0 @@ -drop table if exists t1,t2,t3; -drop database if exists showtemp; -create database if not exists showtemp; -use test; -create temporary table t1(id int); -create temporary table t2(id int); -create temporary table showtemp.t3(id int); -insert into t1 values(10),(20),(30),(40); -insert into showtemp.t3 values(999); -show temporary tables; -Temp_tables_in_test -t2 -t1 -show temporary tables from test; -Temp_tables_in_test -t2 -t1 -show temporary tables in showtemp; -Temp_tables_in_showtemp -t3 -select table_schema, table_name, engine, table_rows from Information_schema.temporary_tables; -table_schema table_name engine table_rows -showtemp t3 MyISAM 1 -test t2 MyISAM 0 -test t1 MyISAM 4 -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables; -table_schema table_name engine table_rows -showtemp t3 MyISAM 1 -test t2 MyISAM 0 -test t1 MyISAM 4 -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables where table_schema='showtemp'; -table_schema table_name engine table_rows -showtemp t3 MyISAM 1 -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables where table_schema='temp'; -table_schema table_name engine table_rows -drop table if exists showtemp.t2; -create temporary table t1(id int); -create temporary table showtemp.t2(id int); -show temporary tables; -Temp_tables_in_test -t1 -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables; -table_schema table_name engine table_rows -showtemp t2 MyISAM 0 -test t1 MyISAM 0 -showtemp t3 MyISAM 1 -test t2 MyISAM 0 -test t1 MyISAM 4 -drop table showtemp.t2; -drop table t1; -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables; -table_schema table_name engine table_rows -showtemp t3 MyISAM 1 -test t2 MyISAM 0 -test t1 MyISAM 4 -drop table t1, t2; -drop table showtemp.t3; -drop database showtemp; diff --git a/mysql-test/suite/percona/percona_show_temp_tables.test b/mysql-test/suite/percona/percona_show_temp_tables.test deleted file mode 100644 index 8837df199c5..00000000000 --- a/mysql-test/suite/percona/percona_show_temp_tables.test +++ /dev/null @@ -1,65 +0,0 @@ -# Uses GRANT commands that usually disabled in embedded server --- source include/not_embedded.inc - -# Save the initial number of concurrent sessions ---source include/count_sessions.inc - -# -# Test of SHOW [GLOBAL] TEMPORARY TABLES [FROM/IN] DB and -# Information_schema.temporary_tables and global_temporary_tables -# - -connect(stcon1,localhost,root,,test); -connect(stcon2,localhost,root,,test); - -connection stcon1; - ---disable_warnings -drop table if exists t1,t2,t3; -drop database if exists showtemp; -create database if not exists showtemp; ---enable_warnings - -use test; -create temporary table t1(id int); -create temporary table t2(id int); -create temporary table showtemp.t3(id int); -insert into t1 values(10),(20),(30),(40); -insert into showtemp.t3 values(999); - -show temporary tables; -# "Session" is not same value always. mysql-test cannot test it always. -#show global temporary tables; -show temporary tables from test; -show temporary tables in showtemp; -select table_schema, table_name, engine, table_rows from Information_schema.temporary_tables; -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables; -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables where table_schema='showtemp'; -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables where table_schema='temp'; - -connection stcon2; - ---disable_warnings -drop table if exists showtemp.t2; ---enable_warnings -create temporary table t1(id int); -create temporary table showtemp.t2(id int); -show temporary tables; -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables; -drop table showtemp.t2; -drop table t1; - -disconnect stcon2; - -connection stcon1; -select table_schema, table_name, engine, table_rows from Information_schema.global_temporary_tables; - -drop table t1, t2; -drop table showtemp.t3; -drop database showtemp; - -connection default; -disconnect stcon1; - -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl-master.opt b/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl-master.opt deleted file mode 100644 index 233b50a1f89..00000000000 --- a/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow_query_log_timestamp_always diff --git a/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl.result b/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl.result deleted file mode 100644 index 13684fad10c..00000000000 --- a/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl.result +++ /dev/null @@ -1,3 +0,0 @@ -show global variables like 'slow_query_log_timestamp_always'; -Variable_name Value -slow_query_log_timestamp_always ON diff --git a/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl.test b/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl.test deleted file mode 100644 index e73c4202869..00000000000 --- a/mysql-test/suite/percona/percona_slow_extended-slow_query_log_timestamp_always-cl.test +++ /dev/null @@ -1 +0,0 @@ -show global variables like 'slow_query_log_timestamp_always'; diff --git a/mysql-test/suite/percona/percona_slow_extended-use_global_control-master.opt b/mysql-test/suite/percona/percona_slow_extended-use_global_control-master.opt deleted file mode 100644 index bd62c08c475..00000000000 --- a/mysql-test/suite/percona/percona_slow_extended-use_global_control-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1 diff --git a/mysql-test/suite/percona/percona_slow_extended-use_global_control.result b/mysql-test/suite/percona/percona_slow_extended-use_global_control.result deleted file mode 100644 index 699c95e9671..00000000000 --- a/mysql-test/suite/percona/percona_slow_extended-use_global_control.result +++ /dev/null @@ -1,12 +0,0 @@ -SELECT sleep(2); -sleep(2) -0 -set global log_slow_verbosity=innodb; -set global slow_query_log_use_global_control="log_slow_verbosity,long_query_time"; -SELECT sleep(2); -sleep(2) -0 -set global slow_query_log_use_global_control=''; -set global log_slow_verbosity=''; -FLUSH LOGS; -1 diff --git a/mysql-test/suite/percona/percona_slow_extended-use_global_control.test b/mysql-test/suite/percona/percona_slow_extended-use_global_control.test deleted file mode 100644 index 199b652561c..00000000000 --- a/mysql-test/suite/percona/percona_slow_extended-use_global_control.test +++ /dev/null @@ -1,12 +0,0 @@ -source include/have_xtradb.inc; -SELECT sleep(2); -set global log_slow_verbosity=innodb; -set global slow_query_log_use_global_control="log_slow_verbosity,long_query_time"; -SELECT sleep(2); -set global slow_query_log_use_global_control=''; -set global log_slow_verbosity=''; - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log ---let grep_pattern = No InnoDB statistics available for this query ---source grep.inc diff --git a/mysql-test/suite/percona/percona_sync_flush.result b/mysql-test/suite/percona/percona_sync_flush.result deleted file mode 100644 index 12335257b32..00000000000 --- a/mysql-test/suite/percona/percona_sync_flush.result +++ /dev/null @@ -1,35 +0,0 @@ -DROP TABLE IF EXISTS t1; -CREATE TABLE t1 (id INT AUTO_INCREMENT, foo CHAR(255), PRIMARY KEY (id)) ENGINE=InnoDB; -SET @@global.innodb_flush_checkpoint_debug=1; -INSERT INTO t1(foo) VALUES ('a'), ('b'); -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -INSERT INTO t1(foo) SELECT foo FROM t1; -UPDATE t1 SET foo='c'; -SET @@global.innodb_flush_checkpoint_debug=0; -UPDATE t1 SET foo='d' WHERE foo='c'; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_sync_flush.test b/mysql-test/suite/percona/percona_sync_flush.test deleted file mode 100644 index 4252bf03e7f..00000000000 --- a/mysql-test/suite/percona/percona_sync_flush.test +++ /dev/null @@ -1,33 +0,0 @@ -# Test for InnoDB sync state flushing. - ---source include/have_xtradb.inc ---source include/have_debug.inc - ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - -CREATE TABLE t1 (id INT AUTO_INCREMENT, foo CHAR(255), PRIMARY KEY (id)) ENGINE=InnoDB; - -# It is hard to get to InnoDB sync state flushing in MTR with regular workload. Perhaps -# it is possible with many parallel connections, but that would be brittle anyway. -# So, just disable preflushing and checkpointing and issue simple workload. -SET @@global.innodb_flush_checkpoint_debug=1; - -INSERT INTO t1(foo) VALUES ('a'), ('b'); - -let $rep=0; -while ($rep < 14) -{ - INSERT INTO t1(foo) SELECT foo FROM t1; - UPDATE t1 SET foo='c'; - inc $rep; -} - -# By now checkpoint age should be well past sync flush point. Allow -# preflushing/checkpointing again and do some work in order to do the sync flush. -SET @@global.innodb_flush_checkpoint_debug=0; - -UPDATE t1 SET foo='d' WHERE foo='c'; - -DROP TABLE t1; diff --git a/mysql-test/suite/percona/percona_xtradb_bug317074.result b/mysql-test/suite/percona/percona_xtradb_bug317074.result deleted file mode 100644 index 7c1876fb7bf..00000000000 --- a/mysql-test/suite/percona/percona_xtradb_bug317074.result +++ /dev/null @@ -1,5 +0,0 @@ -SET @old_innodb_file_format=@@innodb_file_format; -SET @old_innodb_file_format_max=@@innodb_file_format_max; -SET @old_innodb_file_per_table=@@innodb_file_per_table; -SET GLOBAL innodb_file_format='Barracuda'; -SET GLOBAL innodb_file_per_table=ON; diff --git a/mysql-test/suite/percona/percona_xtradb_bug317074.test b/mysql-test/suite/percona/percona_xtradb_bug317074.test deleted file mode 100644 index 5f9db073060..00000000000 --- a/mysql-test/suite/percona/percona_xtradb_bug317074.test +++ /dev/null @@ -1,48 +0,0 @@ --- source include/have_xtradb.inc - -SET @old_innodb_file_format=@@innodb_file_format; -SET @old_innodb_file_format_max=@@innodb_file_format_max; -SET @old_innodb_file_per_table=@@innodb_file_per_table; -SET GLOBAL innodb_file_format='Barracuda'; -SET GLOBAL innodb_file_per_table=ON; - --- disable_query_log --- disable_result_log - -DROP TABLE IF EXISTS `test1`; -CREATE TABLE IF NOT EXISTS `test1` ( - `a` int primary key auto_increment, - `b` int default 0, - `c` char(100) default 'testtest' -) ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8; - -set autocommit=0; -delimiter |; -CREATE PROCEDURE insert_many(p1 int) -BEGIN -SET @x = 0; -SET @y = 0; -start transaction; -REPEAT - insert into test1 set b=1; - SET @x = @x + 1; - SET @y = @y + 1; - IF @y >= 1000 THEN - commit; - start transaction; - SET @y = 0; - END IF; -UNTIL @x >= p1 END REPEAT; -commit; -END| -delimiter ;| -call insert_many(100000); -DROP PROCEDURE insert_many; - -# The bug is hangup at the following statement -ALTER TABLE test1 ENGINE=MyISAM; - -DROP TABLE test1; -SET GLOBAL innodb_file_format=@old_innodb_file_format; -SET GLOBAL innodb_file_format_max=@old_innodb_file_format_max; -SET GLOBAL innodb_file_per_table=@old_innodb_file_per_table; diff --git a/mysql-test/suite/percona/profiling_slow.patch/percona_bug643149.result b/mysql-test/suite/percona/profiling_slow.patch/percona_bug643149.result deleted file mode 100644 index 1a447a194e7..00000000000 --- a/mysql-test/suite/percona/profiling_slow.patch/percona_bug643149.result +++ /dev/null @@ -1,21 +0,0 @@ -SET @old_slow_query_log_file=@@global.slow_query_log_file; -SET GLOBAL slow_query_log=on; -SET LOCAL log_slow_verbosity='profiling'; -SET LOCAL long_query_time=0; -SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug643149_slow.log';; -SELECT 1; -1 -1 -# User@Host: root[root] @ localhost [] -# Thread_id: X Schema: test Last_errno: X Killed: X -# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X -# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X -# Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X -# Profile_total: X.X Profile_total_cpu: X.X -# User@Host: root[root] @ localhost [] -# Thread_id: X Schema: test Last_errno: X Killed: X -# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X -# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X -# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X -# Profile_total: X.X Profile_total_cpu: X.X -SET GLOBAL slow_query_log_file=@old_slow_query_log_file; diff --git a/mysql-test/suite/percona/profiling_slow.patch/percona_bug643149.test b/mysql-test/suite/percona/profiling_slow.patch/percona_bug643149.test deleted file mode 100644 index fa31b169a19..00000000000 --- a/mysql-test/suite/percona/profiling_slow.patch/percona_bug643149.test +++ /dev/null @@ -1,49 +0,0 @@ -# -# This test suffers from server -# Bug#38124 "general_log_file" variable silently unset when using expression -# In short: -# SET GLOBAL general_log_file = @<whatever> -# SET GLOBAL slow_query_log = @<whatever> -# cause that the value of these server system variables is set to default -# instead of the assigned values. There comes no error message or warning. -# If this bug is fixed please -# 1. try this test with "let $fixed_bug38124 = 0;" -# 2. remove all workarounds if 1. was successful. ---source include/have_profiling.inc -let $fixed_bug38124 = 0; - -SET @old_slow_query_log_file=@@global.slow_query_log_file; -SET GLOBAL slow_query_log=on; -SET LOCAL log_slow_verbosity='profiling'; -SET LOCAL long_query_time=0; - -let slogfile=$MYSQLTEST_VARDIR/percona_bug643149_slow.log; ---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR ---eval SET GLOBAL slow_query_log_file='$slogfile'; - -SELECT 1; - -perl; - $slogfile= $ENV{'slogfile'}; - - open(FILE, "$slogfile") or - die("Unable to read slow query log file $slogfile: $!\n"); - while(<FILE>) { - next if (!/^#/); - next if (/^# Time:/); - s/[0-9]+/X/g; - print; - } - - close(FILE); -EOF - -SET GLOBAL slow_query_log_file=@old_slow_query_log_file; - -if(!$fixed_bug38124) -{ - --disable_query_log - let $my_var = `SELECT @old_slow_query_log_file`; - eval SET @@global.slow_query_log_file = '$my_var'; - --enable_query_log -} diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.inc b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.inc deleted file mode 100644 index d9804722147..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.inc +++ /dev/null @@ -1,117 +0,0 @@ ---source percona_query_cache_with_comments_clear.inc -let $query=/* with comment first */select * from t1; -eval $query; ---source percona_query_cache_with_comments_eval.inc - -let $query=# with comment first -select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first -select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query=/* with comment first and "quote" */select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query=# with comment first and "quote" -select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first and "quote" -select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query= - /* with comment and whitespaces first */select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query= - # with comment and whitespaces first -select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query= - -- with comment and whitespaces first -select * from t1; ---source percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment *; - -let $query=select * /$internal/ from t1; ---source percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment with "quote" *; - -let $query=select * /$internal/ from t1; ---source percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* *\/ */; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */ -; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end -; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end; ---source percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end -; ---source percona_query_cache_with_comments_eval.inc - -let $query=select */* a comment \*/from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select *# a comment \\ -from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select *-- a comment \\ -from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select "\\\\"" /* not a comment */" from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select "\\\\"" /*! not a comment */" from t1; ---source include/percona_query_cache_with_comments_eval.inc - -# following two queries related to bug #856404. -# There are different queries, but opt_query_cache_strip_comments thinks that they are equal. -let $query=select ' \' ' from t1; ---source percona_query_cache_with_comments_eval.inc - -let $query=select ' \' /* comment inside quotes with internal backslash quote */' from t1; ---source percona_query_cache_with_comments_eval.inc diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.inc.backup b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.inc.backup deleted file mode 100644 index 4b5b31e9239..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.inc.backup +++ /dev/null @@ -1,88 +0,0 @@ ---source include/percona_query_cache_with_comments_clear.inc -let $query=/* with comment first */select * from t1; -eval $query; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=# with comment first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=/* with comment first and "quote" */select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=# with comment first and "quote" -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=-- with comment first and "quote" -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - /* with comment and whitespaces first */select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - # with comment and whitespaces first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query= - -- with comment and whitespaces first -select * from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment *; - -let $query=select * /$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $internal=* internal comment with "quote" *; - -let $query=select * /$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/ from t1; ---source include/percona_query_cache_with_comments_eval.inc -let $query=select */$internal/from t1; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 ; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -/* comment in the end */ -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 #comment in the end -; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end; ---source include/percona_query_cache_with_comments_eval.inc - -let $query=select * from t1 -- comment in the end -; ---source include/percona_query_cache_with_comments_eval.inc diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.result b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.result deleted file mode 100644 index d1a6ded08d7..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.result +++ /dev/null @@ -1,1058 +0,0 @@ -set global query_cache_strip_comments=ON; -set GLOBAL query_cache_size=1355776; -drop table if exists t1; -create table t1 (a int not null); -insert into t1 values (1),(2),(3); -flush query cache; -flush query cache; -reset query cache; -flush status; -flush query cache; -flush query cache; -reset query cache; -flush status; -/* with comment first */select * from t1; -a -1 -2 -3 ------------------------------------------------------ -/* with comment first */select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 0 -/* with comment first */select * from t1; -a -1 -2 -3 -/* with comment first */select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 ------------------------------------------------------ -# with comment first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 -# with comment first -select * from t1; -a -1 -2 -3 -# with comment first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 ------------------------------------------------------ --- with comment first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 --- with comment first -select * from t1; -a -1 -2 -3 --- with comment first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 6 ------------------------------------------------------ -/* with comment first and "quote" */select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 6 -/* with comment first and "quote" */select * from t1; -a -1 -2 -3 -/* with comment first and "quote" */select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 8 ------------------------------------------------------ -# with comment first and "quote" -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 8 -# with comment first and "quote" -select * from t1; -a -1 -2 -3 -# with comment first and "quote" -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 10 ------------------------------------------------------ --- with comment first and "quote" -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 10 --- with comment first and "quote" -select * from t1; -a -1 -2 -3 --- with comment first and "quote" -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 12 ------------------------------------------------------ -/* with comment and whitespaces first */select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 12 -/* with comment and whitespaces first */select * from t1; -a -1 -2 -3 -/* with comment and whitespaces first */select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 14 ------------------------------------------------------ -# with comment and whitespaces first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 14 -# with comment and whitespaces first -select * from t1; -a -1 -2 -3 -# with comment and whitespaces first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 16 ------------------------------------------------------ --- with comment and whitespaces first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 16 --- with comment and whitespaces first -select * from t1; -a -1 -2 -3 --- with comment and whitespaces first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 18 ------------------------------------------------------ -select * /* internal comment */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 18 -select * /* internal comment */ from t1; -a -1 -2 -3 -select * /* internal comment */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 20 ------------------------------------------------------ -select */* internal comment */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 20 -select */* internal comment */ from t1; -a -1 -2 -3 -select */* internal comment */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 22 ------------------------------------------------------ -select */* internal comment */from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 22 -select */* internal comment */from t1; -a -1 -2 -3 -select */* internal comment */from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 24 ------------------------------------------------------ -select * /* internal comment with "quote" */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 24 -select * /* internal comment with "quote" */ from t1; -a -1 -2 -3 -select * /* internal comment with "quote" */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 26 ------------------------------------------------------ -select */* internal comment with "quote" */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 26 -select */* internal comment with "quote" */ from t1; -a -1 -2 -3 -select */* internal comment with "quote" */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 28 ------------------------------------------------------ -select */* internal comment with "quote" */from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 28 -select */* internal comment with "quote" */from t1; -a -1 -2 -3 -select */* internal comment with "quote" */from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 30 ------------------------------------------------------ -select * from t1 - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 30 -select * from t1 -; -a -1 -2 -3 -select * from t1 -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 32 ------------------------------------------------------ -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 32 -select * from t1 ; -a -1 -2 -3 -select * from t1 ; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 34 ------------------------------------------------------ -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 34 -select * from t1 ; -a -1 -2 -3 -select * from t1 ; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 36 ------------------------------------------------------ -select * from t1 -/* comment in the end */ ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 36 -select * from t1 -/* comment in the end */; -a -1 -2 -3 -select * from t1 -/* comment in the end */; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 38 ------------------------------------------------------ -select * from t1 -/* *\/ */ ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 38 -select * from t1 -/* *\/ */; -a -1 -2 -3 -select * from t1 -/* *\/ */; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 40 ------------------------------------------------------ -select * from t1 -/* comment in the end */ - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 40 -select * from t1 -/* comment in the end */ -; -a -1 -2 -3 -select * from t1 -/* comment in the end */ -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 42 ------------------------------------------------------ -select * from t1 #comment in the end ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 42 -select * from t1 #comment in the end; -a -1 -2 -3 -select * from t1 #comment in the end; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 44 ------------------------------------------------------ -select * from t1 #comment in the end - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 44 -select * from t1 #comment in the end -; -a -1 -2 -3 -select * from t1 #comment in the end -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 46 ------------------------------------------------------ -select * from t1 -- comment in the end ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 46 -select * from t1 -- comment in the end; -a -1 -2 -3 -select * from t1 -- comment in the end; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 48 ------------------------------------------------------ -select * from t1 -- comment in the end - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 48 -select * from t1 -- comment in the end -; -a -1 -2 -3 -select * from t1 -- comment in the end -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 50 ------------------------------------------------------ -select */* a comment \*/from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 50 -select */* a comment \*/from t1; -a -1 -2 -3 -select */* a comment \*/from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 52 ------------------------------------------------------ -select *# a comment \ -from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 52 -select *# a comment \ -from t1; -a -1 -2 -3 -select *# a comment \ -from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 54 ------------------------------------------------------ -select *-- a comment \ -from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 54 -select *-- a comment \ -from t1; -a -1 -2 -3 -select *-- a comment \ -from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 56 ------------------------------------------------------ -select "\\"" /* not a comment */" from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 56 -select "\\"" /* not a comment */" from t1; -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -select "\\"" /* not a comment */" from t1; -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 2 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 2 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 57 ------------------------------------------------------ -select "\\"" /*! not a comment */" from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 2 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 2 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 57 -select "\\"" /*! not a comment */" from t1; -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -select "\\"" /*! not a comment */" from t1; -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 3 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 3 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 58 ------------------------------------------------------ -select ' \' ' from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 3 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 3 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 58 -select ' \' ' from t1; -' - ' - ' - ' -select ' \' ' from t1; -' - ' - ' - ' -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 4 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 4 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 59 ------------------------------------------------------ -select ' \' /* comment inside quotes with internal backslash quote */' from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 4 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 4 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 59 -select ' \' /* comment inside quotes with internal backslash quote */' from t1; -' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ -select ' \' /* comment inside quotes with internal backslash quote */' from t1; -' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 5 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 5 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 60 -DROP TABLE t1; -SET GLOBAL query_cache_size=default; -set global query_cache_strip_comments=OFF; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.test b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.test deleted file mode 100644 index 0b93441f364..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments.test +++ /dev/null @@ -1,5 +0,0 @@ ---disable_ps_protocol -set global query_cache_strip_comments=ON; --- source include/percona_query_cache_with_comments_begin.inc --- source include/percona_query_cache_with_comments.inc --- source include/percona_query_cache_with_comments_end.inc diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_begin.inc b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_begin.inc deleted file mode 100644 index 6bfd2bfbc83..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_begin.inc +++ /dev/null @@ -1,12 +0,0 @@ --- source include/have_query_cache.inc - -set GLOBAL query_cache_size=1355776; - ---disable_warnings -drop table if exists t1; ---enable_warnings - -create table t1 (a int not null); -insert into t1 values (1),(2),(3); - ---source percona_query_cache_with_comments_clear.inc diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_clear.inc b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_clear.inc deleted file mode 100644 index 728a19a3c97..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_clear.inc +++ /dev/null @@ -1,5 +0,0 @@ -# Reset query cache variables. -flush query cache; # This crashed in some versions -flush query cache; # This crashed in some versions -reset query cache; -flush status; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_crash.result b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_crash.result deleted file mode 100644 index 32bd3645ec4..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_crash.result +++ /dev/null @@ -1,21 +0,0 @@ -set GLOBAL query_cache_size=1355776; -drop table if exists t1; -create table t1 (a int not null); -insert into t1 values (1),(2),(3); -flush query cache; -flush query cache; -reset query cache; -flush status; -( select * from t1 ); -a -1 -2 -3 -/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, @@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), @OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, @@SQL_QUOTE_SHOW_CREATE := 1 */; -/* only comment */; -# only comment -; --- only comment -; -DROP TABLE t1; -SET GLOBAL query_cache_size= default; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_crash.test b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_crash.test deleted file mode 100644 index e125c75c3de..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_crash.test +++ /dev/null @@ -1,22 +0,0 @@ --- source include/have_query_cache.inc -set GLOBAL query_cache_size=1355776; ---disable_warnings -drop table if exists t1; ---enable_warnings -create table t1 (a int not null); -insert into t1 values (1),(2),(3); -flush query cache; # This crashed in some versions -flush query cache; # This crashed in some versions -reset query cache; -flush status; -( select * from t1 ); -/*!40101 SET @OLD_SQL_MODE := @@SQL_MODE, @@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), @OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, @@SQL_QUOTE_SHOW_CREATE := 1 */; -/* only comment */; -let query=# only comment -; -eval $query; -let query=-- only comment -; -eval $query; -DROP TABLE t1; -SET GLOBAL query_cache_size= default; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_disable.result b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_disable.result deleted file mode 100644 index 7e793a942c5..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_disable.result +++ /dev/null @@ -1,1057 +0,0 @@ -set GLOBAL query_cache_size=1355776; -drop table if exists t1; -create table t1 (a int not null); -insert into t1 values (1),(2),(3); -flush query cache; -flush query cache; -reset query cache; -flush status; -flush query cache; -flush query cache; -reset query cache; -flush status; -/* with comment first */select * from t1; -a -1 -2 -3 ------------------------------------------------------ -/* with comment first */select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 0 -/* with comment first */select * from t1; -a -1 -2 -3 -/* with comment first */select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 ------------------------------------------------------ -# with comment first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 -# with comment first -select * from t1; -a -1 -2 -3 -# with comment first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 2 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 2 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 ------------------------------------------------------ --- with comment first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 2 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 2 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 --- with comment first -select * from t1; -a -1 -2 -3 --- with comment first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 3 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 3 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 ------------------------------------------------------ -/* with comment first and "quote" */select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 3 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 3 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 2 -/* with comment first and "quote" */select * from t1; -a -1 -2 -3 -/* with comment first and "quote" */select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 4 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 4 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 3 ------------------------------------------------------ -# with comment first and "quote" -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 4 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 4 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 3 -# with comment first and "quote" -select * from t1; -a -1 -2 -3 -# with comment first and "quote" -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 5 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 5 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 3 ------------------------------------------------------ --- with comment first and "quote" -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 5 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 5 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 3 --- with comment first and "quote" -select * from t1; -a -1 -2 -3 --- with comment first and "quote" -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 6 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 6 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 3 ------------------------------------------------------ -/* with comment and whitespaces first */select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 6 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 6 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 3 -/* with comment and whitespaces first */select * from t1; -a -1 -2 -3 -/* with comment and whitespaces first */select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 7 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 7 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 ------------------------------------------------------ -# with comment and whitespaces first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 7 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 7 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 -# with comment and whitespaces first -select * from t1; -a -1 -2 -3 -# with comment and whitespaces first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 8 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 8 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 ------------------------------------------------------ --- with comment and whitespaces first -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 8 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 8 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 --- with comment and whitespaces first -select * from t1; -a -1 -2 -3 --- with comment and whitespaces first -select * from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 9 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 9 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 ------------------------------------------------------ -select * /* internal comment */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 9 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 9 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 4 -select * /* internal comment */ from t1; -a -1 -2 -3 -select * /* internal comment */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 10 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 10 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 5 ------------------------------------------------------ -select */* internal comment */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 10 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 10 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 5 -select */* internal comment */ from t1; -a -1 -2 -3 -select */* internal comment */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 11 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 11 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 6 ------------------------------------------------------ -select */* internal comment */from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 11 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 11 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 6 -select */* internal comment */from t1; -a -1 -2 -3 -select */* internal comment */from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 12 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 12 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 7 ------------------------------------------------------ -select * /* internal comment with "quote" */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 12 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 12 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 7 -select * /* internal comment with "quote" */ from t1; -a -1 -2 -3 -select * /* internal comment with "quote" */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 13 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 13 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 8 ------------------------------------------------------ -select */* internal comment with "quote" */ from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 13 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 13 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 8 -select */* internal comment with "quote" */ from t1; -a -1 -2 -3 -select */* internal comment with "quote" */ from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 14 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 14 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 9 ------------------------------------------------------ -select */* internal comment with "quote" */from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 14 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 14 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 9 -select */* internal comment with "quote" */from t1; -a -1 -2 -3 -select */* internal comment with "quote" */from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 15 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 15 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 10 ------------------------------------------------------ -select * from t1 - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 15 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 15 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 10 -select * from t1 -; -a -1 -2 -3 -select * from t1 -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 16 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 16 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 11 ------------------------------------------------------ -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 16 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 16 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 11 -select * from t1 ; -a -1 -2 -3 -select * from t1 ; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 16 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 16 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 13 ------------------------------------------------------ -select * from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 16 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 16 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 13 -select * from t1 ; -a -1 -2 -3 -select * from t1 ; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 16 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 16 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 15 ------------------------------------------------------ -select * from t1 -/* comment in the end */ ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 16 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 16 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 15 -select * from t1 -/* comment in the end */; -a -1 -2 -3 -select * from t1 -/* comment in the end */; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 17 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 17 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 16 ------------------------------------------------------ -select * from t1 -/* *\/ */ ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 17 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 17 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 16 -select * from t1 -/* *\/ */; -a -1 -2 -3 -select * from t1 -/* *\/ */; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 18 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 18 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 17 ------------------------------------------------------ -select * from t1 -/* comment in the end */ - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 18 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 18 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 17 -select * from t1 -/* comment in the end */ -; -a -1 -2 -3 -select * from t1 -/* comment in the end */ -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 18 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 18 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 19 ------------------------------------------------------ -select * from t1 #comment in the end ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 18 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 18 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 19 -select * from t1 #comment in the end; -a -1 -2 -3 -select * from t1 #comment in the end; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 19 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 19 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 20 ------------------------------------------------------ -select * from t1 #comment in the end - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 19 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 19 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 20 -select * from t1 #comment in the end -; -a -1 -2 -3 -select * from t1 #comment in the end -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 19 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 19 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 22 ------------------------------------------------------ -select * from t1 -- comment in the end ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 19 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 19 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 22 -select * from t1 -- comment in the end; -a -1 -2 -3 -select * from t1 -- comment in the end; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 20 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 20 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 23 ------------------------------------------------------ -select * from t1 -- comment in the end - ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 20 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 20 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 23 -select * from t1 -- comment in the end -; -a -1 -2 -3 -select * from t1 -- comment in the end -; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 20 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 20 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 25 ------------------------------------------------------ -select */* a comment \*/from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 20 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 20 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 25 -select */* a comment \*/from t1; -a -1 -2 -3 -select */* a comment \*/from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 21 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 21 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 26 ------------------------------------------------------ -select *# a comment \ -from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 21 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 21 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 26 -select *# a comment \ -from t1; -a -1 -2 -3 -select *# a comment \ -from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 22 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 22 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 27 ------------------------------------------------------ -select *-- a comment \ -from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 22 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 22 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 27 -select *-- a comment \ -from t1; -a -1 -2 -3 -select *-- a comment \ -from t1; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 23 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 23 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 28 ------------------------------------------------------ -select "\\"" /* not a comment */" from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 23 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 23 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 28 -select "\\"" /* not a comment */" from t1; -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -select "\\"" /* not a comment */" from t1; -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -\" /* not a comment */ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 24 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 24 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 29 ------------------------------------------------------ -select "\\"" /*! not a comment */" from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 24 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 24 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 29 -select "\\"" /*! not a comment */" from t1; -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -select "\\"" /*! not a comment */" from t1; -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -\" /*! not a comment */ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 25 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 25 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 30 ------------------------------------------------------ -select ' \' ' from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 25 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 25 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 30 -select ' \' ' from t1; -' - ' - ' - ' -select ' \' ' from t1; -' - ' - ' - ' -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 26 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 26 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 31 ------------------------------------------------------ -select ' \' /* comment inside quotes with internal backslash quote */' from t1 ------------------------------------------------------ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 26 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 26 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 31 -select ' \' /* comment inside quotes with internal backslash quote */' from t1; -' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ -select ' \' /* comment inside quotes with internal backslash quote */' from t1; -' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ - ' /* comment inside quotes with internal backslash quote */ -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 27 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 27 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 32 -DROP TABLE t1; -SET GLOBAL query_cache_size=default; -set global query_cache_strip_comments=OFF; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_disable.test b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_disable.test deleted file mode 100644 index ad59ac3566c..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_disable.test +++ /dev/null @@ -1,3 +0,0 @@ --- source include/percona_query_cache_with_comments_begin.inc --- source include/percona_query_cache_with_comments.inc --- source include/percona_query_cache_with_comments_end.inc diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_end.inc b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_end.inc deleted file mode 100644 index d5356359d7e..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_end.inc +++ /dev/null @@ -1,3 +0,0 @@ -DROP TABLE t1; -SET GLOBAL query_cache_size=default; -set global query_cache_strip_comments=OFF; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_eval.inc b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_eval.inc deleted file mode 100644 index f0c200245e0..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_eval.inc +++ /dev/null @@ -1,7 +0,0 @@ -echo -----------------------------------------------------; -echo $query; -echo -----------------------------------------------------; ---source percona_query_cache_with_comments_show.inc -eval $query; -eval $query; ---source percona_query_cache_with_comments_show.inc diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_prepared_statements.result b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_prepared_statements.result deleted file mode 100644 index 9b28b7f0b62..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_prepared_statements.result +++ /dev/null @@ -1,396 +0,0 @@ -set GLOBAL query_cache_size=1355776; -flush query cache; -flush query cache; -reset query cache; -flush status; -drop table if exists t1; -create table t1 (a int not null); -insert into t1 values (1),(2),(3); -set global query_cache_strip_comments=ON; -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 0 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 0 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 0 -prepare stmt from '/* with comment */ select * from t1'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 0 -execute stmt; -a -1 -2 -3 -execute stmt; -a -1 -2 -3 -execute stmt; -a -1 -2 -3 -execute stmt; -a -1 -2 -3 -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 5 -prepare stmt from 'select * from t1'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 6 -prepare stmt from 'select * /*internal comment*/from t1'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 7 -prepare stmt from 'select * /*internal comment*/ from t1'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 8 -prepare stmt from 'select * from t1 /* at the end */'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 9 -prepare stmt from 'select * from t1 /* with "quote" */'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 10 -prepare stmt from 'select * from t1 /* with \'quote\' */'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 11 -prepare stmt from 'select * from t1 # 123 -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 12 -prepare stmt from 'select * from t1 # 123 with "quote" -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 13 -prepare stmt from 'select * from t1 # 123 with \'quote\' -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 14 -prepare stmt from 'select * from t1 -# 123 -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 15 -prepare stmt from '#456 -select * from t1 -# 123 -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 16 -prepare stmt from 'select * from t1 -- 123 -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 17 -prepare stmt from 'select * from t1 --- 123 -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 18 -prepare stmt from '-- comment in first -select * from t1 -# 123 -'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 1 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 1 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 19 -prepare stmt from '(#456( -select * from t1 -# 123( -)'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 2 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 2 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 19 -prepare stmt from '/*test*/(-- comment in first( -select * from t1 --- 123 asdasd -/* test */)'; -execute stmt; -a -1 -2 -3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 2 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 2 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 20 -prepare stmt from 'select "test",a from t1'; -execute stmt; -test a -test 1 -test 2 -test 3 -execute stmt; -test a -test 1 -test 2 -test 3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 3 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 3 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 21 -prepare stmt from 'select "test /* internal \'comment\' */",a from t1'; -execute stmt; -test /* internal 'comment' */ a -test /* internal 'comment' */ 1 -test /* internal 'comment' */ 2 -test /* internal 'comment' */ 3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 4 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 4 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 21 -prepare stmt from 'select "test #internal comment" ,a from t1'; -execute stmt; -test #internal comment a -test #internal comment 1 -test #internal comment 2 -test #internal comment 3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 5 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 5 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 21 -prepare stmt from 'select "test #internal comment" #external comment -,a from t1'; -execute stmt; -test #internal comment a -test #internal comment 1 -test #internal comment 2 -test #internal comment 3 -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 5 -show status like "Qcache_inserts"; -Variable_name Value -Qcache_inserts 5 -show status like "Qcache_hits"; -Variable_name Value -Qcache_hits 22 -DROP TABLE t1; -SET GLOBAL query_cache_size= default; -set global query_cache_strip_comments=OFF; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_prepared_statements.test b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_prepared_statements.test deleted file mode 100644 index 78cb7220aff..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_prepared_statements.test +++ /dev/null @@ -1,208 +0,0 @@ --- source include/have_query_cache.inc - -set GLOBAL query_cache_size=1355776; - -# Reset query cache variables. -flush query cache; # This crashed in some versions -flush query cache; # This crashed in some versions -reset query cache; -flush status; ---disable_warnings -drop table if exists t1; ---enable_warnings - -# -# First simple test -# - -create table t1 (a int not null); -insert into t1 values (1),(2),(3); - -set global query_cache_strip_comments=ON; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from '/* with comment */ select * from t1'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -execute stmt; -execute stmt; -execute stmt; -execute stmt; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * /*internal comment*/from t1'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * /*internal comment*/ from t1'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 /* at the end */'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 /* with "quote" */'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 /* with \'quote\' */'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 # 123 -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 # 123 with "quote" -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 # 123 with \'quote\' -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 -# 123 -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from '#456 -select * from t1 -# 123 -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 -- 123 -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select * from t1 --- 123 -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from '-- comment in first -select * from t1 -# 123 -'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from '(#456( -select * from t1 -# 123( -)'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from '/*test*/(-- comment in first( -select * from t1 --- 123 asdasd -/* test */)'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select "test",a from t1'; -execute stmt; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select "test /* internal \'comment\' */",a from t1'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select "test #internal comment" ,a from t1'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -prepare stmt from 'select "test #internal comment" #external comment -,a from t1'; -execute stmt; - -show status like "Qcache_queries_in_cache"; -show status like "Qcache_inserts"; -show status like "Qcache_hits"; - -DROP TABLE t1; -SET GLOBAL query_cache_size= default; -set global query_cache_strip_comments=OFF; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_show.inc b/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_show.inc deleted file mode 100644 index 71aa5211cfd..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_query_cache_with_comments_show.inc +++ /dev/null @@ -1,8 +0,0 @@ -let $show=show status like "Qcache_queries_in_cache"; -eval $show; -let $show=show status like "Qcache_inserts"; -eval $show; -let $show=show status like "Qcache_hits"; -eval $show; - - diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.result b/mysql-test/suite/percona/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.result deleted file mode 100644 index c243b8ad02f..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.result +++ /dev/null @@ -1,20 +0,0 @@ -SET GLOBAL query_cache_size=1355776; -flush query cache; -flush query cache; -reset query cache; -flush status; -SET DEBUG_SYNC='after_query_cache_mutex SIGNAL mutex_locked WAIT_FOR unlock_mutex'; -SELECT "mutex_locked_query" as action; -SET DEBUG_SYNC='now WAIT_FOR mutex_locked'; -SET DEBUG_SYNC='before_query_cache_mutex SIGNAL try_lock_mutex'; -SELECT "try_lock_mutex_query" as action; -SET DEBUG_SYNC='now WAIT_FOR try_lock_mutex'; -SELECT SQL_NO_CACHE state FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info='SELECT "try_lock_mutex_query" as action'; -state -Waiting on query cache mutex -SET DEBUG_SYNC='now SIGNAL unlock_mutex'; -action -mutex_locked_query -action -try_lock_mutex_query -SET GLOBAL query_cache_size=0; diff --git a/mysql-test/suite/percona/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.test b/mysql-test/suite/percona/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.test deleted file mode 100644 index b20f088d6ae..00000000000 --- a/mysql-test/suite/percona/query_cache_enhance.patch/percona_status_wait_query_cache_mutex.test +++ /dev/null @@ -1,35 +0,0 @@ ---source include/have_query_cache.inc ---source include/have_debug.inc ---source include/have_debug_sync.inc -SET GLOBAL query_cache_size=1355776; ---source include/percona_query_cache_with_comments_clear.inc ---let try_lock_mutex_query=SELECT "try_lock_mutex_query" as action - ---connect (mutex_locked_conn, localhost, root,,) ---connect (try_mutex_lock_conn, localhost, root,,) - ---connection mutex_locked_conn -SET DEBUG_SYNC='after_query_cache_mutex SIGNAL mutex_locked WAIT_FOR unlock_mutex'; -send SELECT "mutex_locked_query" as action; - ---connection default -SET DEBUG_SYNC='now WAIT_FOR mutex_locked'; - ---connection try_mutex_lock_conn -SET DEBUG_SYNC='before_query_cache_mutex SIGNAL try_lock_mutex'; -send_eval $try_lock_mutex_query; - ---connection default -SET DEBUG_SYNC='now WAIT_FOR try_lock_mutex'; -eval SELECT SQL_NO_CACHE state FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info='$try_lock_mutex_query'; -SET DEBUG_SYNC='now SIGNAL unlock_mutex'; - ---connection mutex_locked_conn -reap; ---connection try_mutex_lock_conn -reap; - ---connection default ---disconnect mutex_locked_conn ---disconnect try_mutex_lock_conn -SET GLOBAL query_cache_size=0; diff --git a/mysql-test/suite/percona/query_response_time-replication.inc b/mysql-test/suite/percona/query_response_time-replication.inc deleted file mode 100644 index 9bd811a9a1b..00000000000 --- a/mysql-test/suite/percona/query_response_time-replication.inc +++ /dev/null @@ -1,57 +0,0 @@ -connection master; - -CREATE TABLE t(id INT); - -connection slave; -SET GLOBAL query_exec_time = 0.1; ---source include/restart_slave_sql.inc - -connection slave; - -SET SESSION query_exec_time=0.1; - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; ---eval SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; - -connection master; - -SET SESSION query_exec_time = 0.31; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.32; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.33; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.34; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.35; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.36; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.37; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.38; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.39; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.4; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.1; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.2; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.3; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.5; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 1.4; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 0.5; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.1; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.3; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 2.5; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 3.1; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 4.1; INSERT INTO t VALUES(1); -SET SESSION query_exec_time = 5.1; INSERT INTO t VALUES(1); - -sync_slave_with_master; - -connection slave; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SHOW QUERY_RESPONSE_TIME; -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; - -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=default; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=default; - -connection master; -DROP TABLE t; - -sync_slave_with_master; diff --git a/mysql-test/suite/percona/query_response_time-stored.inc b/mysql-test/suite/percona/query_response_time-stored.inc deleted file mode 100644 index a1fc8912aab..00000000000 --- a/mysql-test/suite/percona/query_response_time-stored.inc +++ /dev/null @@ -1,37 +0,0 @@ -SET SESSION query_exec_time=0.1; - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base; -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; - -CALL test_f(0.31); -CALL test_f(0.32); -CALL test_f(0.33); -CALL test_f(0.34); -CALL test_f(0.35); -CALL test_f(0.36); -CALL test_f(0.37); -CALL test_f(0.38); -CALL test_f(0.39); -CALL test_f(0.4); -CALL test_f(1.1); -CALL test_f(1.2); -CALL test_f(1.3); -CALL test_f(1.5); -CALL test_f(1.4); -CALL test_f(0.5); -CALL test_f(2.1); -CALL test_f(2.3); -CALL test_f(2.5); -CALL test_f(3.1); -CALL test_f(4.1); -CALL test_f(5.1); - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SHOW QUERY_RESPONSE_TIME; -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; - -SET SESSION query_exec_time=default; diff --git a/mysql-test/suite/percona/query_response_time.inc b/mysql-test/suite/percona/query_response_time.inc deleted file mode 100644 index 734d3f5a262..00000000000 --- a/mysql-test/suite/percona/query_response_time.inc +++ /dev/null @@ -1,43 +0,0 @@ -SET SESSION query_exec_time=0.1; - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; -EVAL SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE=$base; -FLUSH QUERY_RESPONSE_TIME; -# Following two queries check works of FLUSH and -# respecting of "QUERY_RESPONSE_TIME_STATS" variable (see launchpad bug #855312) -SHOW QUERY_RESPONSE_TIME; -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SET GLOBAL QUERY_RESPONSE_TIME_STATS=1; - -SET SESSION query_exec_time=0.31; SELECT 1; -SET SESSION query_exec_time=0.32; SELECT 1; -SET SESSION query_exec_time=0.33; SELECT 1; -SET SESSION query_exec_time=0.34; SELECT 1; -SET SESSION query_exec_time=0.35; SELECT 1; -SET SESSION query_exec_time=0.36; SELECT 1; -SET SESSION query_exec_time=0.37; SELECT 1; -SET SESSION query_exec_time=0.38; SELECT 1; -SET SESSION query_exec_time=0.39; SELECT 1; -SET SESSION query_exec_time=0.4; SELECT 1; -SET SESSION query_exec_time=1.1; SELECT 1; -SET SESSION query_exec_time=1.2; SELECT 1; -SET SESSION query_exec_time=1.3; SELECT 1; -SET SESSION query_exec_time=1.5; SELECT 1; -SET SESSION query_exec_time=1.4; SELECT 1; -SET SESSION query_exec_time=0.5; SELECT 1; -SET SESSION query_exec_time=2.1; SELECT 1; -SET SESSION query_exec_time=2.3; SELECT 1; -SET SESSION query_exec_time=2.5; SELECT 1; -SET SESSION query_exec_time=3.1; SELECT 1; -SET SESSION query_exec_time=4.1; SELECT 1; -SET SESSION query_exec_time=5.1; SELECT 1; - -SET SESSION query_exec_time=0.1; - -SET GLOBAL QUERY_RESPONSE_TIME_STATS=0; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SHOW QUERY_RESPONSE_TIME; -SELECT * FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; - -SET SESSION query_exec_time=default; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-replication.result b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-replication.result deleted file mode 100644 index 950cdbf7532..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-replication.result +++ /dev/null @@ -1,70 +0,0 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds"; -DROP TABLE IF EXISTS t; -CREATE TABLE t(id INT); -SELECT * from t; -id -SELECT * from t; -id -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON; -INSERT INTO t SELECT SLEEP(0.4); -Warnings: -Note 1592 Statement may not be safe to log in statement format. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -INSERT INTO t SELECT SLEEP(0.4); -Warnings: -Note 1592 Statement may not be safe to log in statement format. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -2 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -3 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -FLUSH QUERY_RESPONSE_TIME; -INSERT INTO t SELECT SLEEP(0.4); -Warnings: -Note 1592 Statement may not be safe to log in statement format. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -INSERT INTO t SELECT SLEEP(0.4); -Warnings: -Note 1592 Statement may not be safe to log in statement format. -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -0 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -2 -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) -3 -DROP TABLE IF EXISTS t; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF; -SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-replication.test b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-replication.test deleted file mode 100644 index b215d3b45b2..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-replication.test +++ /dev/null @@ -1,57 +0,0 @@ ---source include/have_response_time_distribution.inc ---source include/master-slave.inc ---source include/have_binlog_format_statement.inc ---source include/have_debug.inc -SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds"; - -connection master; --- disable_warnings -DROP TABLE IF EXISTS t; --- enable_warnings -CREATE TABLE t(id INT); -SELECT * from t; - -sync_slave_with_master; - -connection slave; -SELECT * from t; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=ON; - -connection master; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -sync_slave_with_master; - -connection slave; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; - -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -source include/percona_query_response_time_flush.inc; - -connection master; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -INSERT INTO t SELECT SLEEP(0.4); -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -sync_slave_with_master; - -connection slave; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SELECT SUM(INFORMATION_SCHEMA.QUERY_RESPONSE_TIME.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; - -connection master; -DROP TABLE IF EXISTS t; -sync_slave_with_master; -connection slave; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=OFF; -SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-stored.result b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-stored.result deleted file mode 100644 index 6ca471867ab..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-stored.result +++ /dev/null @@ -1,313 +0,0 @@ -SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds"; -CREATE FUNCTION test_f() -RETURNS CHAR(30) DETERMINISTIC -BEGIN -DECLARE first VARCHAR(5); -DECLARE second VARCHAR(5); -DECLARE result VARCHAR(20); -SELECT SLEEP(1.11) INTO first; -SET first= 'Hello'; -SET second=', '; -SET result= CONCAT(first,second); -SET result= CONCAT(result,'world!'); -RETURN result; -END/ -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -FLUSH QUERY_RESPONSE_TIME; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! -SELECT test_f(); -test_f() -Hello, world! -SELECT test_f(); -test_f() -Hello, world! -SELECT test_f(); -test_f() -Hello, world! -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -4 4 4 1 44 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 14 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -14 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000010 - 0.000100 - 0.001000 - 0.010000 - 0.100000 - 1.000000 - 10.000000 - 100.000000 - 1000.000000 - 10000.000000 - 100000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 17 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -17 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000008 - 0.000059 - 0.000416 - 0.002915 - 0.020408 - 0.142857 - 1.000000 - 7.000000 - 49.000000 - 343.000000 - 2401.000000 - 16807.000000 - 117649.000000 - 823543.000000 - 5764801.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 7 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -7 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000041 - 0.006410 - 1.000000 - 156.000000 - 24336.000000 - 3796416.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -test_f() -Hello, world! -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -1 1 1 1 6 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -6 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.001000 - 1.000000 - 1000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; -DROP FUNCTION test_f; -SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-stored.test b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-stored.test deleted file mode 100644 index 01651aae928..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time-stored.test +++ /dev/null @@ -1,90 +0,0 @@ ---source include/have_response_time_distribution.inc ---source include/have_debug.inc -SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds"; - -delimiter /; -CREATE FUNCTION test_f() -RETURNS CHAR(30) DETERMINISTIC -BEGIN - DECLARE first VARCHAR(5); - DECLARE second VARCHAR(5); - DECLARE result VARCHAR(20); - SELECT SLEEP(1.11) INTO first; - SET first= 'Hello'; - SET second=', '; - SET result= CONCAT(first,second); - SET result= CONCAT(result,'world!'); - RETURN result; -END/ -delimiter ;/ - -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -source include/percona_query_response_time_show.inc; - -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SELECT test_f(); -SELECT test_f(); -SELECT test_f(); -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT test_f(); -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; - -DROP FUNCTION test_f; -SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time.result b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time.result deleted file mode 100644 index 7599c9f0263..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time.result +++ /dev/null @@ -1,567 +0,0 @@ -SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds"; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1' -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -FLUSH QUERY_RESPONSE_TIME; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT SLEEP(0.31); -SLEEP(0.31) -0 -SELECT SLEEP(0.32); -SLEEP(0.32) -0 -SELECT SLEEP(0.33); -SLEEP(0.33) -0 -SELECT SLEEP(0.34); -SLEEP(0.34) -0 -SELECT SLEEP(0.35); -SLEEP(0.35) -0 -SELECT SLEEP(0.36); -SLEEP(0.36) -0 -SELECT SLEEP(0.37); -SLEEP(0.37) -0 -SELECT SLEEP(0.38); -SLEEP(0.38) -0 -SELECT SLEEP(0.39); -SLEEP(0.39) -0 -SELECT SLEEP(0.40); -SLEEP(0.40) -0 -SELECT SLEEP(1.1); -SLEEP(1.1) -0 -SELECT SLEEP(1.2); -SLEEP(1.2) -0 -SELECT SLEEP(1.3); -SLEEP(1.3) -0 -SELECT SLEEP(1.5); -SLEEP(1.5) -0 -SELECT SLEEP(1.4); -SLEEP(1.4) -0 -SELECT SLEEP(0.5); -SLEEP(0.5) -0 -SELECT SLEEP(2.1); -SLEEP(2.1) -0 -SELECT SLEEP(2.3); -SLEEP(2.3) -0 -SELECT SLEEP(2.5); -SLEEP(2.5) -0 -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -10 19 15 4 44 -1 19 15 4 44 -5 19 15 4 44 -3 19 15 4 44 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -44 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000003 - 0.000007 - 0.000015 - 0.000030 - 0.000061 - 0.000122 - 0.000244 - 0.000488 - 0.000976 - 0.001953 - 0.003906 - 0.007812 - 0.015625 - 0.031250 - 0.062500 - 0.125000 - 0.250000 - 0.500000 - 1.000000 - 2.000000 - 4.000000 - 8.000000 - 16.000000 - 32.000000 - 64.000000 - 128.000000 - 256.000000 - 512.000000 - 1024.000000 - 2048.000000 - 4096.000000 - 8192.000000 - 16384.000000 - 32768.000000 - 65536.000000 - 131072.000000 - 262144.000000 - 524288.000000 - 1048576.00000 - 2097152.00000 - 4194304.00000 - 8388608.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 2 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT SLEEP(0.31); -SLEEP(0.31) -0 -SELECT SLEEP(0.32); -SLEEP(0.32) -0 -SELECT SLEEP(0.33); -SLEEP(0.33) -0 -SELECT SLEEP(0.34); -SLEEP(0.34) -0 -SELECT SLEEP(0.35); -SLEEP(0.35) -0 -SELECT SLEEP(0.36); -SLEEP(0.36) -0 -SELECT SLEEP(0.37); -SLEEP(0.37) -0 -SELECT SLEEP(0.38); -SLEEP(0.38) -0 -SELECT SLEEP(0.39); -SLEEP(0.39) -0 -SELECT SLEEP(0.40); -SLEEP(0.40) -0 -SELECT SLEEP(1.1); -SLEEP(1.1) -0 -SELECT SLEEP(1.2); -SLEEP(1.2) -0 -SELECT SLEEP(1.3); -SLEEP(1.3) -0 -SELECT SLEEP(1.5); -SLEEP(1.5) -0 -SELECT SLEEP(1.4); -SLEEP(1.4) -0 -SELECT SLEEP(0.5); -SLEEP(0.5) -0 -SELECT SLEEP(2.1); -SLEEP(2.1) -0 -SELECT SLEEP(2.3); -SLEEP(2.3) -0 -SELECT SLEEP(2.5); -SLEEP(2.5) -0 -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 14 -8 19 17 2 14 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -14 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000010 - 0.000100 - 0.001000 - 0.010000 - 0.100000 - 1.000000 - 10.000000 - 100.000000 - 1000.000000 - 10000.000000 - 100000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 10 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT SLEEP(0.31); -SLEEP(0.31) -0 -SELECT SLEEP(0.32); -SLEEP(0.32) -0 -SELECT SLEEP(0.33); -SLEEP(0.33) -0 -SELECT SLEEP(0.34); -SLEEP(0.34) -0 -SELECT SLEEP(0.35); -SLEEP(0.35) -0 -SELECT SLEEP(0.36); -SLEEP(0.36) -0 -SELECT SLEEP(0.37); -SLEEP(0.37) -0 -SELECT SLEEP(0.38); -SLEEP(0.38) -0 -SELECT SLEEP(0.39); -SLEEP(0.39) -0 -SELECT SLEEP(0.40); -SLEEP(0.40) -0 -SELECT SLEEP(1.1); -SLEEP(1.1) -0 -SELECT SLEEP(1.2); -SLEEP(1.2) -0 -SELECT SLEEP(1.3); -SLEEP(1.3) -0 -SELECT SLEEP(1.5); -SLEEP(1.5) -0 -SELECT SLEEP(1.4); -SLEEP(1.4) -0 -SELECT SLEEP(0.5); -SLEEP(0.5) -0 -SELECT SLEEP(2.1); -SLEEP(2.1) -0 -SELECT SLEEP(2.3); -SLEEP(2.3) -0 -SELECT SLEEP(2.5); -SLEEP(2.5) -0 -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 17 -8 19 17 2 17 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -17 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.000008 - 0.000059 - 0.000416 - 0.002915 - 0.020408 - 0.142857 - 1.000000 - 7.000000 - 49.000000 - 343.000000 - 2401.000000 - 16807.000000 - 117649.000000 - 823543.000000 - 5764801.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 7 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT SLEEP(0.31); -SLEEP(0.31) -0 -SELECT SLEEP(0.32); -SLEEP(0.32) -0 -SELECT SLEEP(0.33); -SLEEP(0.33) -0 -SELECT SLEEP(0.34); -SLEEP(0.34) -0 -SELECT SLEEP(0.35); -SLEEP(0.35) -0 -SELECT SLEEP(0.36); -SLEEP(0.36) -0 -SELECT SLEEP(0.37); -SLEEP(0.37) -0 -SELECT SLEEP(0.38); -SLEEP(0.38) -0 -SELECT SLEEP(0.39); -SLEEP(0.39) -0 -SELECT SLEEP(0.40); -SLEEP(0.40) -0 -SELECT SLEEP(1.1); -SLEEP(1.1) -0 -SELECT SLEEP(1.2); -SLEEP(1.2) -0 -SELECT SLEEP(1.3); -SLEEP(1.3) -0 -SELECT SLEEP(1.5); -SLEEP(1.5) -0 -SELECT SLEEP(1.4); -SLEEP(1.4) -0 -SELECT SLEEP(0.5); -SLEEP(0.5) -0 -SELECT SLEEP(2.1); -SLEEP(2.1) -0 -SELECT SLEEP(2.3); -SLEEP(2.3) -0 -SELECT SLEEP(2.5); -SLEEP(2.5) -0 -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 7 -8 19 17 2 7 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -7 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000041 - 0.006410 - 1.000000 - 156.000000 - 24336.000000 - 3796416.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 156 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -FLUSH QUERY_RESPONSE_TIME; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -SELECT SLEEP(0.31); -SLEEP(0.31) -0 -SELECT SLEEP(0.32); -SLEEP(0.32) -0 -SELECT SLEEP(0.33); -SLEEP(0.33) -0 -SELECT SLEEP(0.34); -SLEEP(0.34) -0 -SELECT SLEEP(0.35); -SLEEP(0.35) -0 -SELECT SLEEP(0.36); -SLEEP(0.36) -0 -SELECT SLEEP(0.37); -SLEEP(0.37) -0 -SELECT SLEEP(0.38); -SLEEP(0.38) -0 -SELECT SLEEP(0.39); -SLEEP(0.39) -0 -SELECT SLEEP(0.40); -SLEEP(0.40) -0 -SELECT SLEEP(1.1); -SLEEP(1.1) -0 -SELECT SLEEP(1.2); -SLEEP(1.2) -0 -SELECT SLEEP(1.3); -SLEEP(1.3) -0 -SELECT SLEEP(1.5); -SLEEP(1.5) -0 -SELECT SLEEP(1.4); -SLEEP(1.4) -0 -SELECT SLEEP(0.5); -SLEEP(0.5) -0 -SELECT SLEEP(2.1); -SLEEP(2.1) -0 -SELECT SLEEP(2.3); -SLEEP(2.3) -0 -SELECT SLEEP(2.5); -SLEEP(2.5) -0 -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -count query_count query_total not_zero_region_count region_count -11 19 17 2 6 -8 19 17 2 6 -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -region_count -6 -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -time - 0.000001 - 0.001000 - 1.000000 - 1000.000000 - 1000000.00000 -TOO LONG -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; -Warnings: -Warning 1292 Truncated incorrect query_response_time_range_base value: '1001' -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -Variable_name Value -query_response_time_range_base 1000 -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; -SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time.test b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time.test deleted file mode 100644 index 6dd0f54abf5..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time.test +++ /dev/null @@ -1,68 +0,0 @@ ---source include/have_response_time_distribution.inc ---source include/have_debug.inc -SET SESSION debug="+d,response_time_distribution_log_only_more_300_milliseconds"; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 2; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -source include/percona_query_response_time_show.inc; - -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 10; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 7; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 156; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1000; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -source include/percona_query_response_time_flush.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=1; -source include/percona_query_response_time_sleep.inc; -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; - -source include/percona_query_response_time_show.inc; - -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE = 1001; -SHOW GLOBAL VARIABLES where Variable_name like 'QUERY_RESPONSE_TIME_RANGE_BASE'; - -SET GLOBAL ENABLE_QUERY_RESPONSE_TIME_STATS=0; -SET GLOBAL QUERY_RESPONSE_TIME_RANGE_BASE =10; -SET SESSION debug="-d,response_time_distribution_log_only_more_300_milliseconds"; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_flush.inc b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_flush.inc deleted file mode 100644 index 44bb320fe13..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_flush.inc +++ /dev/null @@ -1 +0,0 @@ -FLUSH QUERY_RESPONSE_TIME; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_show.inc b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_show.inc deleted file mode 100644 index 709abf9872e..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_show.inc +++ /dev/null @@ -1,8 +0,0 @@ -SELECT d.count, -(SELECT SUM(a.count) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as a WHERE a.count != 0) as query_count, -(SELECT SUM((b.total * 1000000) DIV 1000000) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as b WHERE b.count != 0) as query_total, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as c WHERE c.count != 0) as not_zero_region_count, -(SELECT COUNT(*) FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME) as region_count -FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME as d WHERE d.count > 0; -SELECT COUNT(*) as region_count FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; -SELECT time FROM INFORMATION_SCHEMA.QUERY_RESPONSE_TIME; diff --git a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_sleep.inc b/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_sleep.inc deleted file mode 100644 index 40688b173b0..00000000000 --- a/mysql-test/suite/percona/response-time-distribution.patch/percona_query_response_time_sleep.inc +++ /dev/null @@ -1,19 +0,0 @@ -SELECT SLEEP(0.31); -SELECT SLEEP(0.32); -SELECT SLEEP(0.33); -SELECT SLEEP(0.34); -SELECT SLEEP(0.35); -SELECT SLEEP(0.36); -SELECT SLEEP(0.37); -SELECT SLEEP(0.38); -SELECT SLEEP(0.39); -SELECT SLEEP(0.40); -SELECT SLEEP(1.1); -SELECT SLEEP(1.2); -SELECT SLEEP(1.3); -SELECT SLEEP(1.5); -SELECT SLEEP(1.4); -SELECT SLEEP(0.5); -SELECT SLEEP(2.1); -SELECT SLEEP(2.3); -SELECT SLEEP(2.5); diff --git a/mysql-test/suite/percona/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result b/mysql-test/suite/percona/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result deleted file mode 100644 index b98e4a93953..00000000000 --- a/mysql-test/suite/percona/show_slave_status_nolock.patch/percona_show_slave_status_nolock.result +++ /dev/null @@ -1,69 +0,0 @@ -include/master-slave.inc -[connection master] -call mtr.add_suppression("Slave SQL: Request to stop slave SQL Thread received while applying a group that has non-transactional changes"); -include/rpl_connect.inc [creating slave_lock] -include/rpl_connect.inc [creating slave_nolock] -[master] -DROP TABLE IF EXISTS t; -CREATE TABLE t(id INT); -[slave] -SET DEBUG_SYNC='RESET'; -SET GLOBAL DEBUG="+d,after_mysql_insert,after_show_slave_status"; -[master] -INSERT INTO t VALUES(0); -[slave] -check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - both should work fine - -[slave_lock] -SHOW SLAVE STATUS; -SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; -SIGNAL after SHOW SLAVE STATUS is 'signal.after_show_slave_status' -[slave] -SET DEBUG_SYNC='now SIGNAL signal.empty'; -[slave_nolock] -SHOW SLAVE STATUS NOLOCK; -SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; -# should be 'signal.after_show_slave_status' -SIGNAL after SHOW SLAVE STATUS NOLOCK is 'signal.after_show_slave_status' -[slave] -SET DEBUG_SYNC='now SIGNAL signal.continue'; -[slave] -SET DEBUG_SYNC='now SIGNAL signal.empty'; - -[master] -INSERT INTO t VALUES(1); -[slave] -include/rpl_connect.inc [creating slave_stop] -[slave_stop] -STOP SLAVE; -[slave] -check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - just NOLOCK version should works fine - -[slave_lock] -SHOW SLAVE STATUS; -SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; -SIGNAL after SHOW SLAVE STATUS is 'signal.empty' -[slave] -SET DEBUG_SYNC='now SIGNAL signal.empty'; -[slave_nolock] -SHOW SLAVE STATUS NOLOCK; -SET DEBUG_SYNC='now WAIT_FOR signal.after_show_slave_status TIMEOUT 1'; -# should be 'signal.after_show_slave_status' -SIGNAL after SHOW SLAVE STATUS NOLOCK is 'signal.after_show_slave_status' -[slave] -SET DEBUG_SYNC='now SIGNAL signal.continue'; -[slave] -SET DEBUG_SYNC='now SIGNAL signal.empty'; - -[slave_stop] -include/wait_for_slave_to_stop.inc -START SLAVE; -include/wait_for_slave_to_start.inc -[master] -SET DEBUG_SYNC='RESET'; -[slave] -SET GLOBAL DEBUG=''; -SET DEBUG_SYNC='RESET'; -[master] -DROP TABLE t; -include/rpl_end.inc diff --git a/mysql-test/suite/percona/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test b/mysql-test/suite/percona/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test deleted file mode 100644 index df595214ff7..00000000000 --- a/mysql-test/suite/percona/show_slave_status_nolock.patch/percona_show_slave_status_nolock.test +++ /dev/null @@ -1,90 +0,0 @@ ---source include/master-slave.inc ---source include/have_debug_sync.inc ---source include/have_binlog_format_statement.inc - -call mtr.add_suppression("Slave SQL: Request to stop slave SQL Thread received while applying a group that has non-transactional changes"); - ---let $rpl_connection_name=slave_lock ---let $rpl_server_number=2 ---source include/rpl_connect.inc - ---let $rpl_connection_name=slave_nolock ---let $rpl_server_number=2 ---source include/rpl_connect.inc - ---let $show_statement= SHOW PROCESSLIST ---let $field= Info - -connection master; ---echo [master] ---disable_warnings -DROP TABLE IF EXISTS t; ---enable_warnings -CREATE TABLE t(id INT); -sync_slave_with_master; - -connection slave; ---echo [slave] -SET DEBUG_SYNC='RESET'; -SET GLOBAL DEBUG="+d,after_mysql_insert,after_show_slave_status"; - -connection master; ---echo [master] -INSERT INTO t VALUES(0); - -connection slave; ---echo [slave] ---let $condition= 'INSERT INTO t VALUES(0)' ---source include/wait_show_condition.inc - ---echo check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - both should work fine ---source include/percona_show_slave_status_nolock.inc - -connection master; ---echo [master] -INSERT INTO t VALUES(1); - -connection slave; ---echo [slave] ---let $condition= 'INSERT INTO t VALUES(1)' ---source include/wait_show_condition.inc - ---let $rpl_connection_name=slave_stop ---let $rpl_server_number=2 ---source include/rpl_connect.inc - -connection slave_stop; ---echo [slave_stop] -send STOP SLAVE; - -connection slave; ---echo [slave] ---let $condition= 'STOP SLAVE' ---source include/wait_show_condition.inc - ---echo check 'SHOW SLAVE STATUS' and 'SHOW SLAVE STATUS NOLOCK' - just NOLOCK version should works fine ---source include/percona_show_slave_status_nolock.inc - - -connection slave_stop; ---echo [slave_stop] -reap; ---source include/wait_for_slave_to_stop.inc -START SLAVE; ---source include/wait_for_slave_to_start.inc - -connection master; ---echo [master] -SET DEBUG_SYNC='RESET'; - -connection slave; ---echo [slave] -SET GLOBAL DEBUG=''; -SET DEBUG_SYNC='RESET'; - -connection master; ---echo [master] -DROP TABLE t; -sync_slave_with_master; - ---source include/rpl_end.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/grep.inc b/mysql-test/suite/percona/slow_extended.patch/grep.inc deleted file mode 100644 index c9c823fa695..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/grep.inc +++ /dev/null @@ -1,16 +0,0 @@ -perl; - - $file = $ENV{'grep_file'}; - $pattern = $ENV{'grep_pattern'}; - - open(FILE, "$file") - or die("Cannot open file $file: $!\n"); - - $lines = 0; - while(<FILE>) { - $lines++ if (/$pattern/); - } - print "$lines\n"; - - close(FILE); -EOF diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined-master.opt deleted file mode 100644 index b6f54503c34..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined-master.opt +++ /dev/null @@ -1 +0,0 @@ ---use_global_long_query_time --log_slow_verbosity="full" diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined.result deleted file mode 100644 index d51e0722fa2..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined.result +++ /dev/null @@ -1,18 +0,0 @@ -show variables like 'use_global_long_query_time'; -Variable_name Value -use_global_long_query_time ON -show variables like 'use_global_log_slow_control'; -Variable_name Value -use_global_log_slow_control long_query_time -show variables like 'log_slow_verbosity'; -Variable_name Value -log_slow_verbosity microtime,query_plan,innodb -show global variables like 'use_global_long_query_time'; -Variable_name Value -use_global_long_query_time ON -show global variables like 'log_slow_verbosity'; -Variable_name Value -log_slow_verbosity microtime,query_plan,innodb -show global variables like 'use_global_log_slow_control'; -Variable_name Value -use_global_log_slow_control long_query_time diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined.test deleted file mode 100644 index 9a4d57a3efc..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined.test +++ /dev/null @@ -1,6 +0,0 @@ -show variables like 'use_global_long_query_time'; -show variables like 'use_global_log_slow_control'; -show variables like 'log_slow_verbosity'; -show global variables like 'use_global_long_query_time'; -show global variables like 'log_slow_verbosity'; -show global variables like 'use_global_log_slow_control'; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2-master.opt deleted file mode 100644 index 267fe17fabe..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2-master.opt +++ /dev/null @@ -1 +0,0 @@ ---use_global_log_slow_control="long_query_time" diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2.result deleted file mode 100644 index e66a7dc1968..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2.result +++ /dev/null @@ -1,12 +0,0 @@ -show variables like 'use_global_long_query_time'; -Variable_name Value -use_global_long_query_time ON -show variables like 'use_global_log_slow_control'; -Variable_name Value -use_global_log_slow_control long_query_time -show global variables like 'use_global_long_query_time'; -Variable_name Value -use_global_long_query_time ON -show global variables like 'use_global_log_slow_control'; -Variable_name Value -use_global_log_slow_control long_query_time diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2.test deleted file mode 100644 index 2c79c137844..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-combined2.test +++ /dev/null @@ -1,4 +0,0 @@ -show variables like 'use_global_long_query_time'; -show variables like 'use_global_log_slow_control'; -show global variables like 'use_global_long_query_time'; -show global variables like 'use_global_log_slow_control'; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow-master.opt deleted file mode 100644 index bd62c08c475..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow.result deleted file mode 100644 index f91d1af2fb3..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow.result +++ /dev/null @@ -1,12 +0,0 @@ -SELECT sleep(2); -sleep(2) -0 -set global log_slow_verbosity=innodb; -set global use_global_log_slow_control="log_slow_verbosity,long_query_time"; -SELECT sleep(2); -sleep(2) -0 -set global use_global_log_slow_control=none; -set global log_slow_verbosity=microtime; -FLUSH LOGS; -1 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow.test deleted file mode 100644 index bbf90f8ec9b..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-control_global_slow.test +++ /dev/null @@ -1,12 +0,0 @@ -source include/have_innodb.inc; -SELECT sleep(2); -set global log_slow_verbosity=innodb; -set global use_global_log_slow_control="log_slow_verbosity,long_query_time"; -SELECT sleep(2); -set global use_global_log_slow_control=none; -set global log_slow_verbosity=microtime; - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log ---let grep_pattern = No InnoDB statistics available for this query ---source include/grep.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt deleted file mode 100644 index 865dc70ba38..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1 --slow_query_log=OFF diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter.result deleted file mode 100644 index 2f22ef5457b..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter.result +++ /dev/null @@ -1,25 +0,0 @@ -drop table if exists t; -# Create test table -create table t(id INT PRIMARY KEY) engine=InnoDB; -# Insert two rows to test table -insert into t values(1); -insert into t values(2); -insert into t values(3); -SET GLOBAL SLOW_QUERY_LOG=ON; -SELECT sleep(2); -sleep(2) -0 -set log_slow_filter=full_join; -SELECT sleep(2) union select t2.id from t as t1,t as t2; -sleep(2) -0 -1 -2 -3 -SELECT sleep(2); -sleep(2) -0 -SET GLOBAL SLOW_QUERY_LOG=OFF; -drop table if exists t; -FLUSH LOGS; -2 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter.test deleted file mode 100644 index 292c1651e34..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_filter.test +++ /dev/null @@ -1,32 +0,0 @@ -source include/have_xtradb.inc; - ---disable_warnings -drop table if exists t; ---enable_warnings - ---echo # Create test table -create table t(id INT PRIMARY KEY) engine=InnoDB; ---echo # Insert two rows to test table -insert into t values(1); -insert into t values(2); -insert into t values(3); - -SET GLOBAL SLOW_QUERY_LOG=ON; - -SELECT sleep(2); - -set log_slow_filter=full_join; - -SELECT sleep(2) union select t2.id from t as t1,t as t2; -SELECT sleep(2); - -SET GLOBAL SLOW_QUERY_LOG=OFF; - ---disable_warnings -drop table if exists t; ---enable_warnings - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log ---let grep_pattern = Query_time ---source grep.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt deleted file mode 100644 index 4368453928a..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl-master.opt +++ /dev/null @@ -1 +0,0 @@ ---log_slow_sp_statements diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result deleted file mode 100644 index c5653429327..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.result +++ /dev/null @@ -1,3 +0,0 @@ -show global variables like 'log_slow_sp_statements'; -Variable_name Value -log_slow_sp_statements ON diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test deleted file mode 100644 index 47bd960feb5..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_sp_statements-cl.test +++ /dev/null @@ -1 +0,0 @@ -show global variables like 'log_slow_sp_statements'; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt deleted file mode 100644 index 8595eaf73d2..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl-master.opt +++ /dev/null @@ -1 +0,0 @@ ---log_slow_timestamp_every diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result deleted file mode 100644 index 119bc26a743..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.result +++ /dev/null @@ -1,3 +0,0 @@ -show global variables like 'log_slow_timestamp_every'; -Variable_name Value -log_slow_timestamp_every ON diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test deleted file mode 100644 index f1d058b9ba4..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_timestamp_every-cl.test +++ /dev/null @@ -1 +0,0 @@ -show global variables like 'log_slow_timestamp_every'; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt deleted file mode 100644 index d8809c36981..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl-master.opt +++ /dev/null @@ -1 +0,0 @@ ---log_slow_verbosity="full" diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result deleted file mode 100644 index eb8228efb08..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.result +++ /dev/null @@ -1,9 +0,0 @@ -show global variables like 'log_slow_verbosity'; -Variable_name Value -log_slow_verbosity microtime,query_plan,innodb -show variables like 'log_slow_verbosity'; -Variable_name Value -log_slow_verbosity microtime,query_plan,innodb -select @@log_slow_verbosity; -@@log_slow_verbosity -microtime,query_plan,innodb diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test deleted file mode 100644 index 740c4deaebd..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-cl.test +++ /dev/null @@ -1,3 +0,0 @@ -show global variables like 'log_slow_verbosity'; -show variables like 'log_slow_verbosity'; -select @@log_slow_verbosity; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt deleted file mode 100644 index 19ae9c117f0..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result deleted file mode 100644 index 1e7db10c8bd..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity.result +++ /dev/null @@ -1,9 +0,0 @@ -SELECT sleep(2); -sleep(2) -0 -set log_slow_verbosity=innodb; -SELECT sleep(2); -sleep(2) -0 -FLUSH LOGS; -1 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test deleted file mode 100644 index e95ab54af61..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-log_slow_verbosity.test +++ /dev/null @@ -1,12 +0,0 @@ -source include/have_xtradb.inc; - -SELECT sleep(2); - -set log_slow_verbosity=innodb; - -SELECT sleep(2); - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log ---let grep_pattern = No InnoDB statistics available for this query ---source grep.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time-master.opt deleted file mode 100644 index 62e1e981558..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2 --slow-query-log=OFF diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time.result deleted file mode 100644 index f2da4e4d9d6..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time.result +++ /dev/null @@ -1,24 +0,0 @@ -SET GLOBAL SLOW_QUERY_LOG=ON; -SELECT sleep(1); -sleep(1) -0 -SELECT sleep(3); -sleep(3) -0 -SELECT sleep(5); -sleep(5) -0 -set long_query_time=4; -SELECT sleep(1); -sleep(1) -0 -SELECT sleep(3); -sleep(3) -0 -SELECT sleep(5); -sleep(5) -0 -set long_query_time=2; -SET GLOBAL SLOW_QUERY_LOG=OFF; -FLUSH LOGS; -3 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time.test deleted file mode 100644 index 716cc7cb0c3..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-long_query_time.test +++ /dev/null @@ -1,23 +0,0 @@ -source include/have_xtradb.inc; - -SET GLOBAL SLOW_QUERY_LOG=ON; - -SELECT sleep(1); -SELECT sleep(3); -SELECT sleep(5); - -set long_query_time=4; - -SELECT sleep(1); -SELECT sleep(3); -SELECT sleep(5); - -set long_query_time=2; - -SET GLOBAL SLOW_QUERY_LOG=OFF; - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log ---let grep_pattern = Query_time ---source grep.inc - diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt deleted file mode 100644 index ca486d356f5..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1 --slow_query_log=OFF diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result deleted file mode 100644 index ce27c518efe..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result +++ /dev/null @@ -1,13 +0,0 @@ -SET GLOBAL SLOW_QUERY_LOG=ON; -SELECT sleep(2); -sleep(2) -0 -set global slow_query_log_timestamp_precision='microsecond'; -SELECT sleep(2); -sleep(2) -0 -set global slow_query_log_timestamp_precision='second'; -SET GLOBAL SLOW_QUERY_LOG=OFF; -FLUSH LOGS; -1 -2 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test deleted file mode 100644 index 4b437b21e4c..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test +++ /dev/null @@ -1,23 +0,0 @@ -source include/have_xtradb.inc; - -SET GLOBAL SLOW_QUERY_LOG=ON; - -SELECT sleep(2); - -set global slow_query_log_timestamp_precision='microsecond'; - -SELECT sleep(2); - -set global slow_query_log_timestamp_precision='second'; - -SET GLOBAL SLOW_QUERY_LOG=OFF; - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log ---let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+ ---source grep.inc - ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log ---let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+ ---source grep.inc - diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt deleted file mode 100644 index c1cf3ebdb30..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1 --slow-query-log=OFF diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result deleted file mode 100644 index 1e8bc0723ac..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result +++ /dev/null @@ -1,25 +0,0 @@ -drop table if exists t; -# Create test table -create table t(id INT PRIMARY KEY) engine=InnoDB; -# Insert two rows to test table -insert into t values(1); -insert into t values(2); -insert into t values(3); -SET GLOBAL SLOW_QUERY_LOG=ON; -SELECT sleep(2); -sleep(2) -0 -set min_examined_row_limit=5; -SELECT sleep(2) union select t2.id from t as t1,t as t2; -sleep(2) -0 -1 -2 -3 -SELECT sleep(2); -sleep(2) -0 -SET GLOBAL SLOW_QUERY_LOG=OFF; -drop table if exists t; -FLUSH LOGS; -2 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test deleted file mode 100644 index ca68658a6c5..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test +++ /dev/null @@ -1,32 +0,0 @@ -source include/have_xtradb.inc; - ---disable_warnings -drop table if exists t; ---enable_warnings - ---echo # Create test table -create table t(id INT PRIMARY KEY) engine=InnoDB; ---echo # Insert two rows to test table -insert into t values(1); -insert into t values(2); -insert into t values(3); - -SET GLOBAL SLOW_QUERY_LOG=ON; - -SELECT sleep(2); - -set min_examined_row_limit=5; - -SELECT sleep(2) union select t2.id from t as t1,t as t2; -SELECT sleep(2); - -SET GLOBAL SLOW_QUERY_LOG=OFF; - ---disable_warnings -drop table if exists t; ---enable_warnings - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log ---let grep_pattern = Query_time ---source grep.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt deleted file mode 100644 index 286a9c4484d..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats-master.opt +++ /dev/null @@ -1 +0,0 @@ ---long_query_time=0 --log_slow_verbosity=innodb --log_slow_slave_statements diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt deleted file mode 100644 index 286a9c4484d..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---long_query_time=0 --log_slow_verbosity=innodb --log_slow_slave_statements diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result deleted file mode 100644 index 51993e767c2..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result +++ /dev/null @@ -1,22 +0,0 @@ -include/master-slave.inc -[connection master] -DROP TABLE IF EXISTS t; -CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB; -INSERT INTO t VALUES -(1,"aaaaabbbbbcccccdddddeeeeefffff"), -(2,"aaaaabbbbbcccccdddddeeeeefffff"), -(3,"aaaaabbbbbcccccdddddeeeeefffff"), -(4,"aaaaabbbbbcccccdddddeeeeefffff"), -(5,"aaaaabbbbbcccccdddddeeeeefffff"); -INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2; -INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2; -STOP SLAVE; -include/wait_for_slave_to_stop.inc -START SLAVE; -include/wait_for_slave_to_start.inc -INSERT INTO t SELECT t.id,t.data from t; -DROP TABLE IF EXISTS t; -FLUSH LOGS; -4 -STOP SLAVE; -include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test deleted file mode 100644 index b0a6c98870c..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test +++ /dev/null @@ -1,51 +0,0 @@ --- source include/have_binlog_format_mixed_or_statement.inc --- source include/have_xtradb.inc --- source include/master-slave.inc - -connection master; --- disable_warnings -DROP TABLE IF EXISTS t; --- enable_warnings -CREATE TABLE t(id INT,data CHAR(30)) ENGINE=InnoDB; -INSERT INTO t VALUES -(1,"aaaaabbbbbcccccdddddeeeeefffff"), -(2,"aaaaabbbbbcccccdddddeeeeefffff"), -(3,"aaaaabbbbbcccccdddddeeeeefffff"), -(4,"aaaaabbbbbcccccdddddeeeeefffff"), -(5,"aaaaabbbbbcccccdddddeeeeefffff"); -INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2; -INSERT INTO t SELECT t2.id,t2.data from t as t1, t as t2; -sync_slave_with_master; - -connection slave; -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -wait -EOF ---shutdown_server 10 ---source include/wait_until_disconnected.inc ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -restart -EOF ---enable_reconnect ---source include/wait_until_connected_again.inc -START SLAVE; --- source include/wait_for_slave_to_start.inc - -connection master; -INSERT INTO t SELECT t.id,t.data from t; -sync_slave_with_master; - -connection master; -DROP TABLE IF EXISTS t; -sync_slave_with_master; - -connection slave; -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log ---let grep_pattern = InnoDB_IO_r_ops ---source grep.inc - -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt deleted file mode 100644 index 49038530c56..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=1 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt deleted file mode 100644 index 648f309f744..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=1 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result deleted file mode 100644 index e5f4568dd58..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.result +++ /dev/null @@ -1,89 +0,0 @@ -include/master-slave.inc -[connection master] -DROP TABLE IF EXISTS t; -CREATE TABLE t(id INT); -START SLAVE; -include/wait_for_slave_to_start.inc -INSERT INTO t VALUES (1); -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements OFF -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -INSERT INTO t VALUES (2); -STOP SLAVE; -include/wait_for_slave_to_stop.inc -START SLAVE; -include/wait_for_slave_to_start.inc -INSERT INTO t VALUES (3); -show variables like 'long_query_time'; -Variable_name Value -long_query_time 1.000000 -show global variables like 'long_query_time'; -Variable_name Value -long_query_time 1.000000 -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control -set global long_query_time=0; -show variables like 'long_query_time'; -Variable_name Value -long_query_time 1.000000 -show global variables like 'long_query_time'; -Variable_name Value -long_query_time 0.000000 -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control -INSERT INTO t VALUES (4); -show variables like 'long_query_time'; -Variable_name Value -long_query_time 1.000000 -show global variables like 'long_query_time'; -Variable_name Value -long_query_time 0.000000 -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control -set global slow_query_log_use_global_control='long_query_time'; -show variables like 'long_query_time'; -Variable_name Value -long_query_time 0.000000 -show global variables like 'long_query_time'; -Variable_name Value -long_query_time 0.000000 -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control long_query_time -INSERT INTO t VALUES (5); -show variables like 'long_query_time'; -Variable_name Value -long_query_time 0.000000 -show global variables like 'long_query_time'; -Variable_name Value -long_query_time 0.000000 -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control long_query_time -set global long_query_time=1; -set global slow_query_log_use_global_control=''; -FLUSH LOGS; -# Analyse master slow_query_log -0 -0 -0 -0 -0 -FLUSH LOGS; -# Analyse slave slow_query_log -0 -0 -0 -0 -1 -set global log_slow_slave_statements=OFF; -DROP TABLE t; -STOP SLAVE; -include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test deleted file mode 100644 index c718b2c3d28..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-and-use_global_long_query_time.test +++ /dev/null @@ -1,107 +0,0 @@ --- source include/have_binlog_format_mixed_or_statement.inc --- source include/master-slave.inc - -connection master; --- disable_warnings -DROP TABLE IF EXISTS t; --- enable_warnings -CREATE TABLE t(id INT); - --- disable_warnings -connection slave; -START SLAVE; --- source include/wait_for_slave_to_start.inc --- enable_warnings - -connection master; -INSERT INTO t VALUES (1); -sync_slave_with_master; - -connection slave; -show variables like 'log_slow_slave_statements'; -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; - -connection master; -INSERT INTO t VALUES (2); -sync_slave_with_master; -connection slave; - -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc -START SLAVE; --- source include/wait_for_slave_to_start.inc - -connection master; -INSERT INTO t VALUES (3); -sync_slave_with_master; - -connection slave; -show variables like 'long_query_time'; -show global variables like 'long_query_time'; -show global variables like 'slow_query_log_use_global_control'; -set global long_query_time=0; -show variables like 'long_query_time'; -show global variables like 'long_query_time'; -show global variables like 'slow_query_log_use_global_control'; - -connection master; -INSERT INTO t VALUES (4); -sync_slave_with_master; - -connection slave; -show variables like 'long_query_time'; -show global variables like 'long_query_time'; -show global variables like 'slow_query_log_use_global_control'; -set global slow_query_log_use_global_control='long_query_time'; -show variables like 'long_query_time'; -show global variables like 'long_query_time'; -show global variables like 'slow_query_log_use_global_control'; - -#-- echo # Make insert(5) on master -connection master; -INSERT INTO t VALUES (5); -sync_slave_with_master; -connection slave; -show variables like 'long_query_time'; -show global variables like 'long_query_time'; -show global variables like 'slow_query_log_use_global_control'; -set global long_query_time=1; -set global slow_query_log_use_global_control=''; - -connection master; -FLUSH LOGS; - --- echo # Analyse master slow_query_log -let $i=5; -let $k=1; -while($i) -{ - --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log - --let grep_pattern = INSERT INTO t VALUES \($k\) - --source grep.inc - dec $i; - inc $k; -} - -connection slave; -FLUSH LOGS; - --- echo # Analyse slave slow_query_log -let $i=5; -let $k=1; -while($i) -{ - --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log - --let grep_pattern = INSERT INTO t VALUES \($k\) - --source grep.inc - dec $i; - inc $k; -} -set global log_slow_slave_statements=OFF; - -connection master; -DROP TABLE t; -sync_slave_with_master; -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-master.opt deleted file mode 100644 index ebf25ddd37d..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=0 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt deleted file mode 100644 index 96cd9004493..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=0 diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements.result deleted file mode 100644 index 0548dc370b4..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements.result +++ /dev/null @@ -1,94 +0,0 @@ -include/master-slave.inc -[connection master] -DROP TABLE IF EXISTS t; -CREATE TABLE t(id INT); -START SLAVE; -include/wait_for_slave_to_start.inc -INSERT INTO t VALUES (1); -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements OFF -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -INSERT INTO t VALUES (2); -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -STOP SLAVE; -include/wait_for_slave_to_stop.inc -START SLAVE; -include/wait_for_slave_to_start.inc -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -INSERT INTO t VALUES (3); -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -set global log_slow_slave_statements=OFF; -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements OFF -INSERT INTO t VALUES (4); -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements OFF -STOP SLAVE; -include/wait_for_slave_to_stop.inc -START SLAVE; -include/wait_for_slave_to_start.inc -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements OFF -INSERT INTO t VALUES (5); -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements OFF -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -INSERT INTO t VALUES (6); -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -STOP SLAVE; -include/wait_for_slave_to_stop.inc -START SLAVE; -include/wait_for_slave_to_start.inc -show variables like 'log_slow_slave_statements'; -Variable_name Value -log_slow_slave_statements ON -INSERT INTO t VALUES (7); -FLUSH LOGS; -# Analyse master slow_query_log -1 -1 -1 -1 -1 -1 -1 -FLUSH LOGS; -# Analyse slave slow_query_log -0 -0 -1 -0 -0 -0 -1 -set global log_slow_slave_statements=OFF; -DROP TABLE t; -STOP SLAVE; -include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements.test deleted file mode 100644 index 88c74bab69b..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slave_statements.test +++ /dev/null @@ -1,133 +0,0 @@ --- source include/have_binlog_format_statement.inc --- source include/master-slave.inc - -connection master; --- disable_warnings -DROP TABLE IF EXISTS t; --- enable_warnings - -CREATE TABLE t(id INT); - --- disable_warnings -connection slave; -START SLAVE; --- source include/wait_for_slave_to_start.inc --- enable_warnings - -connection master; -INSERT INTO t VALUES (1); -sync_slave_with_master; - -connection slave; -show variables like 'log_slow_slave_statements'; -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; - -connection master; -INSERT INTO t VALUES (2); -sync_slave_with_master; - -connection slave; -show variables like 'log_slow_slave_statements'; -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; - -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc -START SLAVE; --- source include/wait_for_slave_to_start.inc - -connection slave; -show variables like 'log_slow_slave_statements'; -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; - -connection master; -INSERT INTO t VALUES (3); -sync_slave_with_master; - -connection slave; -show variables like 'log_slow_slave_statements'; -set global log_slow_slave_statements=OFF; -show variables like 'log_slow_slave_statements'; - -connection master; -INSERT INTO t VALUES (4); -sync_slave_with_master; - -connection slave; -show variables like 'log_slow_slave_statements'; - -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc -START SLAVE; --- source include/wait_for_slave_to_start.inc - -connection slave; -show variables like 'log_slow_slave_statements'; - -connection master; -INSERT INTO t VALUES (5); -sync_slave_with_master; - -connection slave; -show variables like 'log_slow_slave_statements'; -set global log_slow_slave_statements=ON; -show variables like 'log_slow_slave_statements'; - -connection master; -INSERT INTO t VALUES (6); -sync_slave_with_master; - -connection slave; -show variables like 'log_slow_slave_statements'; - -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc -START SLAVE; --- source include/wait_for_slave_to_start.inc - -connection slave; -show variables like 'log_slow_slave_statements'; - -connection master; -INSERT INTO t VALUES (7); -sync_slave_with_master; - -connection master; -FLUSH LOGS; - --- echo # Analyse master slow_query_log -let $i=7; -let $k=1; -while($i) -{ - --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log - --let grep_pattern = INSERT INTO t VALUES \($k\) - --source grep.inc - dec $i; - inc $k; -} - -connection slave; -FLUSH LOGS; - --- echo # Analyse slave slow_query_log -let $i=7; -let $k=1; -while($i) -{ - --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log - --let grep_pattern = INSERT INTO t VALUES \($k\) - --source grep.inc - dec $i; - inc $k; -} -set global log_slow_slave_statements=OFF; - -connection master; -DROP TABLE t; -sync_slave_with_master; - -STOP SLAVE; --- source include/wait_for_slave_to_stop.inc diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt deleted file mode 100644 index c3ebcd95326..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow_query_log_timestamp_precision='microsecond' diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result deleted file mode 100644 index 5355922bb45..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result +++ /dev/null @@ -1,3 +0,0 @@ -show global variables like 'slow_query_log_timestamp_precision'; -Variable_name Value -slow_query_log_timestamp_precision microsecond diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test deleted file mode 100644 index 8f6291e9897..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.test +++ /dev/null @@ -1 +0,0 @@ -show global variables like 'slow_query_log_timestamp_precision'; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt deleted file mode 100644 index cf93591c365..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl-master.opt +++ /dev/null @@ -1 +0,0 @@ ---use_global_long_query_time diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result deleted file mode 100644 index d554a64bdb4..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.result +++ /dev/null @@ -1,3 +0,0 @@ -show global variables like 'use_global_long_query_time'; -Variable_name Value -use_global_long_query_time ON diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test deleted file mode 100644 index 662aee24ebe..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-cl.test +++ /dev/null @@ -1 +0,0 @@ -show global variables like 'use_global_long_query_time'; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt deleted file mode 100644 index 16b6ca5b714..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt +++ /dev/null @@ -1 +0,0 @@ ---slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2 --slow_query_log_use_global_control=long_query_time --slow-query-log=OFF diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result deleted file mode 100644 index e89edf0430f..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result +++ /dev/null @@ -1,46 +0,0 @@ -SET GLOBAL SLOW_QUERY_LOG=ON; -SELECT sleep(1); -sleep(1) -0 -SELECT sleep(3); -sleep(3) -0 -SELECT sleep(5); -sleep(5) -0 -set global long_query_time=4; -set global slow_query_log_use_global_control='long_query_time'; -SELECT sleep(1); -sleep(1) -0 -SELECT sleep(3); -sleep(3) -0 -SELECT sleep(5); -sleep(5) -0 -set global long_query_time=2; -set global slow_query_log_use_global_control=''; -SET GLOBAL SLOW_QUERY_LOG=OFF; -FLUSH LOGS; -3 -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control -set global slow_query_log_use_global_control='long_query_time'; -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control long_query_time -set global slow_query_log_use_global_control='log_slow_filter,long_query_time'; -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control log_slow_filter,long_query_time -set global slow_query_log_use_global_control='log_slow_filter'; -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control log_slow_filter -set global slow_query_log_use_global_control=''; -show global variables like 'slow_query_log_use_global_control'; -Variable_name Value -slow_query_log_use_global_control -set global slow_query_log_use_global_control='long_query_time'; diff --git a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test b/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test deleted file mode 100644 index 61b2dabd23d..00000000000 --- a/mysql-test/suite/percona/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test +++ /dev/null @@ -1,40 +0,0 @@ -source include/have_xtradb.inc; - -SET GLOBAL SLOW_QUERY_LOG=ON; - -SELECT sleep(1); -SELECT sleep(3); -SELECT sleep(5); - -set global long_query_time=4; -set global slow_query_log_use_global_control='long_query_time'; - -SELECT sleep(1); -SELECT sleep(3); -SELECT sleep(5); - -set global long_query_time=2; -set global slow_query_log_use_global_control=''; - -SET GLOBAL SLOW_QUERY_LOG=OFF; - -FLUSH LOGS; ---let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log ---let grep_pattern = Query_time ---source grep.inc - -show global variables like 'slow_query_log_use_global_control'; - -set global slow_query_log_use_global_control='long_query_time'; -show global variables like 'slow_query_log_use_global_control'; - -set global slow_query_log_use_global_control='log_slow_filter,long_query_time'; -show global variables like 'slow_query_log_use_global_control'; - -set global slow_query_log_use_global_control='log_slow_filter'; -show global variables like 'slow_query_log_use_global_control'; - -set global slow_query_log_use_global_control=''; -show global variables like 'slow_query_log_use_global_control'; - -set global slow_query_log_use_global_control='long_query_time'; diff --git a/mysql-test/suite/percona/sql_no_fcache.patch/percona_sql_no_fcache.result b/mysql-test/suite/percona/sql_no_fcache.patch/percona_sql_no_fcache.result deleted file mode 100644 index bc1413fb96d..00000000000 --- a/mysql-test/suite/percona/sql_no_fcache.patch/percona_sql_no_fcache.result +++ /dev/null @@ -1,12 +0,0 @@ -drop table if exists t1; -create table t (a int not null); -insert into t values (1),(2),(3); -SELECT SQL_NO_FCACHE SLEEP(0); -SLEEP(0) -0 -SELECT /*!40001 SQL_NO_CACHE */ /*!50084 SQL_NO_FCACHE */ * FROM t; -a -1 -2 -3 -DROP TABLE t; diff --git a/mysql-test/suite/percona/sql_no_fcache.patch/percona_sql_no_fcache.test b/mysql-test/suite/percona/sql_no_fcache.patch/percona_sql_no_fcache.test deleted file mode 100644 index 1ed8be2196b..00000000000 --- a/mysql-test/suite/percona/sql_no_fcache.patch/percona_sql_no_fcache.test +++ /dev/null @@ -1,11 +0,0 @@ ---disable_warnings -drop table if exists t1; ---enable_warnings - -create table t (a int not null); -insert into t values (1),(2),(3); - -SELECT SQL_NO_FCACHE SLEEP(0); -SELECT /*!40001 SQL_NO_CACHE */ /*!50084 SQL_NO_FCACHE */ * FROM t; - -DROP TABLE t; diff --git a/mysql-test/suite/percona/userstat_bug602047.result b/mysql-test/suite/percona/userstat_bug602047.result deleted file mode 100644 index 966439b817d..00000000000 --- a/mysql-test/suite/percona/userstat_bug602047.result +++ /dev/null @@ -1,15 +0,0 @@ -DROP TABLE IF EXISTS t1; -SET GLOBAL userstat=ON; -CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); -SELECT COUNT(*) FROM t1; -COUNT(*) -10 -SELECT ROWS_READ FROM information_schema.table_statistics WHERE TABLE_NAME='t1'; -ROWS_READ -10 -SELECT ROWS_READ FROM information_schema.index_statistics WHERE TABLE_NAME='t1'; -ROWS_READ -10 -SET GLOBAL userstat=OFF; -DROP TABLE t1; diff --git a/mysql-test/suite/percona/userstat_bug602047.test b/mysql-test/suite/percona/userstat_bug602047.test deleted file mode 100644 index 31fc36b80e2..00000000000 --- a/mysql-test/suite/percona/userstat_bug602047.test +++ /dev/null @@ -1,12 +0,0 @@ ---source include/have_xtradb.inc ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings -SET GLOBAL userstat=ON; -CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB; -INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); -SELECT COUNT(*) FROM t1; -SELECT ROWS_READ FROM information_schema.table_statistics WHERE TABLE_NAME='t1'; -SELECT ROWS_READ FROM information_schema.index_statistics WHERE TABLE_NAME='t1'; -SET GLOBAL userstat=OFF; -DROP TABLE t1; diff --git a/mysql-test/suite/perfschema/r/threads_innodb,xtradb.rdiff-disabled b/mysql-test/suite/perfschema/r/threads_innodb,xtradb.rdiff-disabled deleted file mode 100644 index bfa17407049..00000000000 --- a/mysql-test/suite/perfschema/r/threads_innodb,xtradb.rdiff-disabled +++ /dev/null @@ -1,10 +0,0 @@ ---- suite/perfschema/r/threads_innodb.result 2013-12-20 20:19:06.000000000 +0100 -+++ suite/perfschema/r/threads_innodb.reject 2014-05-06 13:08:05.000000000 +0200 -@@ -6,6 +6,7 @@ - GROUP BY name; - name type processlist_user processlist_host processlist_db processlist_command processlist_time processlist_state processlist_info parent_thread_id role instrumented - thread/innodb/io_handler_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES -+thread/innodb/lru_manager_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES - thread/innodb/page_cleaner_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES - thread/innodb/srv_error_monitor_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES - thread/innodb/srv_lock_timeout_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES diff --git a/mysql-test/suite/rpl/t/rpl_mdev6020.test b/mysql-test/suite/rpl/t/rpl_mdev6020.test index 8484e3e11c0..ec3fd92f817 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev6020.test +++ b/mysql-test/suite/rpl/t/rpl_mdev6020.test @@ -1,6 +1,3 @@ -# Running this with valgrind can take > 5000 seconds with xtradb ---source include/not_valgrind.inc - --source include/have_innodb.inc --source include/have_partition.inc --source include/have_binlog_format_mixed_or_row.inc diff --git a/mysql-test/suite/sys_vars/disabled.def b/mysql-test/suite/sys_vars/disabled.def index 872474cb1e9..24c3c7a26c6 100644 --- a/mysql-test/suite/sys_vars/disabled.def +++ b/mysql-test/suite/sys_vars/disabled.def @@ -10,6 +10,5 @@ # ############################################################################## -innodb_flush_checkpoint_debug_basic: removed from XtraDB-26.0 all_vars: obsolete, see sysvars_* tests innodb_buffer_pool_dump_pct_function: MDEV-11454 follow-up needed (unstable) diff --git a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_blocking_buffer_pool_restore_basic.result b/mysql-test/suite/sys_vars/r/innodb_blocking_buffer_pool_restore_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_blocking_buffer_pool_restore_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_populate_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_populate_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_populate_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_fake_changes_basic.result b/mysql-test/suite/sys_vars/r/innodb_fake_changes_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_fake_changes_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_flush_checkpoint_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_checkpoint_debug_basic.result deleted file mode 100644 index e543cc30975..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_flush_checkpoint_debug_basic.result +++ /dev/null @@ -1,15 +0,0 @@ -SELECT @@global.innodb_flush_checkpoint_debug; -@@global.innodb_flush_checkpoint_debug -0 -SET @@global.innodb_flush_checkpoint_debug=1; -SELECT @@global.innodb_flush_checkpoint_debug; -@@global.innodb_flush_checkpoint_debug -1 -SET @@global.innodb_flush_checkpoint_debug=0; -SELECT @@global.innodb_flush_checkpoint_debug; -@@global.innodb_flush_checkpoint_debug -0 -SET @@session.innodb_flush_checkpoint_debug=1; -ERROR HY000: Variable 'innodb_flush_checkpoint_debug' is a GLOBAL variable and should be set with SET GLOBAL -SELECT @@session.innodb_flush_checkpoint_debug; -ERROR HY000: Variable 'innodb_flush_checkpoint_debug' is a GLOBAL variable diff --git a/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_kill_idle_transaction_basic.result b/mysql-test/suite/sys_vars/r/innodb_kill_idle_transaction_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_kill_idle_transaction_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_locking_fake_changes_basic.result b/mysql-test/suite/sys_vars/r/innodb_locking_fake_changes_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_locking_fake_changes_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_max_bitmap_file_size_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_bitmap_file_size_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_max_bitmap_file_size_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_max_changed_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_changed_pages_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_max_changed_pages_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_cleaner_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_cleaner_basic.result deleted file mode 100644 index f2bfaf2ed61..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_sched_priority_cleaner_basic.result +++ /dev/null @@ -1,30 +0,0 @@ -SET GLOBAL innodb_sched_priority_cleaner=39; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -@@GLOBAL.innodb_sched_priority_cleaner -19 -SELECT @@SESSION.innodb_sched_priority_cleaner; -ERROR HY000: Variable 'innodb_sched_priority_cleaner' is a GLOBAL variable -SET GLOBAL innodb_sched_priority_cleaner=19; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -@@GLOBAL.innodb_sched_priority_cleaner -19 -SET GLOBAL innodb_sched_priority_cleaner=5; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -@@GLOBAL.innodb_sched_priority_cleaner -5 -SET GLOBAL innodb_sched_priority_cleaner=0; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -@@GLOBAL.innodb_sched_priority_cleaner -0 -SET GLOBAL innodb_sched_priority_cleaner=-1; -Warnings: -Warning 1292 Truncated incorrect innodb_sched_priority_cleaner value: '-1' -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -@@GLOBAL.innodb_sched_priority_cleaner -0 -SET GLOBAL innodb_sched_priority_cleaner=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_cleaner' -SET GLOBAL innodb_sched_priority_cleaner=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_cleaner' -SET GLOBAL innodb_sched_priority_cleaner='foo'; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_cleaner' diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_io_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_io_basic.result deleted file mode 100644 index 5fd7705bfaf..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_sched_priority_io_basic.result +++ /dev/null @@ -1,30 +0,0 @@ -SET @start_value = @@GLOBAL.innodb_sched_priority_io; -SELECT @@GLOBAL.innodb_sched_priority_io; -@@GLOBAL.innodb_sched_priority_io -19 -SELECT @@SESSION.innodb_sched_priority_io; -ERROR HY000: Variable 'innodb_sched_priority_io' is a GLOBAL variable -SET GLOBAL innodb_sched_priority_io=19; -SELECT @@GLOBAL.innodb_sched_priority_io; -@@GLOBAL.innodb_sched_priority_io -19 -SET GLOBAL innodb_sched_priority_io=5; -SELECT @@GLOBAL.innodb_sched_priority_io; -@@GLOBAL.innodb_sched_priority_io -5 -SET GLOBAL innodb_sched_priority_io=0; -SELECT @@GLOBAL.innodb_sched_priority_io; -@@GLOBAL.innodb_sched_priority_io -0 -SET GLOBAL innodb_sched_priority_io=-1; -Warnings: -Warning 1292 Truncated incorrect innodb_sched_priority_io value: '-1' -SELECT @@GLOBAL.innodb_sched_priority_io; -@@GLOBAL.innodb_sched_priority_io -0 -SET GLOBAL innodb_sched_priority_io=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_io' -SET GLOBAL innodb_sched_priority_io=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_io' -SET GLOBAL innodb_sched_priority_io='foo'; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_io' diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_master_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_master_basic.result deleted file mode 100644 index caa72f58369..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_sched_priority_master_basic.result +++ /dev/null @@ -1,30 +0,0 @@ -SET @start_value = @@GLOBAL.innodb_sched_priority_master; -SELECT @@GLOBAL.innodb_sched_priority_master; -@@GLOBAL.innodb_sched_priority_master -19 -SELECT @@SESSION.innodb_sched_priority_master; -ERROR HY000: Variable 'innodb_sched_priority_master' is a GLOBAL variable -SET GLOBAL innodb_sched_priority_master=19; -SELECT @@GLOBAL.innodb_sched_priority_master; -@@GLOBAL.innodb_sched_priority_master -19 -SET GLOBAL innodb_sched_priority_master=5; -SELECT @@GLOBAL.innodb_sched_priority_master; -@@GLOBAL.innodb_sched_priority_master -5 -SET GLOBAL innodb_sched_priority_master=0; -SELECT @@GLOBAL.innodb_sched_priority_master; -@@GLOBAL.innodb_sched_priority_master -0 -SET GLOBAL innodb_sched_priority_master=-1; -Warnings: -Warning 1292 Truncated incorrect innodb_sched_priority_master value: '-1' -SELECT @@GLOBAL.innodb_sched_priority_master; -@@GLOBAL.innodb_sched_priority_master -0 -SET GLOBAL innodb_sched_priority_master=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_master' -SET GLOBAL innodb_sched_priority_master=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_master' -SET GLOBAL innodb_sched_priority_master='foo'; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_master' diff --git a/mysql-test/suite/sys_vars/r/innodb_sched_priority_purge_basic.result b/mysql-test/suite/sys_vars/r/innodb_sched_priority_purge_basic.result deleted file mode 100644 index e3b9c627214..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_sched_priority_purge_basic.result +++ /dev/null @@ -1,30 +0,0 @@ -SET @start_value = @@GLOBAL.innodb_sched_priority_purge; -SELECT @@GLOBAL.innodb_sched_priority_purge; -@@GLOBAL.innodb_sched_priority_purge -19 -SELECT @@SESSION.innodb_sched_priority_purge; -ERROR HY000: Variable 'innodb_sched_priority_purge' is a GLOBAL variable -SET GLOBAL innodb_sched_priority_purge=19; -SELECT @@GLOBAL.innodb_sched_priority_purge; -@@GLOBAL.innodb_sched_priority_purge -19 -SET GLOBAL innodb_sched_priority_purge=5; -SELECT @@GLOBAL.innodb_sched_priority_purge; -@@GLOBAL.innodb_sched_priority_purge -5 -SET GLOBAL innodb_sched_priority_purge=0; -SELECT @@GLOBAL.innodb_sched_priority_purge; -@@GLOBAL.innodb_sched_priority_purge -0 -SET GLOBAL innodb_sched_priority_purge=-1; -Warnings: -Warning 1292 Truncated incorrect innodb_sched_priority_purge value: '-1' -SELECT @@GLOBAL.innodb_sched_priority_purge; -@@GLOBAL.innodb_sched_priority_purge -0 -SET GLOBAL innodb_sched_priority_purge=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_purge' -SET GLOBAL innodb_sched_priority_purge=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_purge' -SET GLOBAL innodb_sched_priority_purge='foo'; -ERROR 42000: Incorrect argument type to variable 'innodb_sched_priority_purge' diff --git a/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_track_changed_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_track_changed_pages_basic.result deleted file mode 100644 index f5d94ee0d18..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_track_changed_pages_basic.result +++ /dev/null @@ -1,19 +0,0 @@ -SELECT COUNT(@@GLOBAL.innodb_track_changed_pages); -COUNT(@@GLOBAL.innodb_track_changed_pages) -1 -SELECT @@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_track_changed_pages'; -@@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE -1 -Warnings: -Warning 1292 Truncated incorrect DOUBLE value: 'OFF' -SELECT @@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages; -@@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages -1 -SELECT COUNT(@@SESSION.innodb_track_changed_pages); -ERROR HY000: Variable 'innodb_track_changed_pages' is a GLOBAL variable -SELECT COUNT(@@LOCAL.innodb_track_changed_pages); -ERROR HY000: Variable 'innodb_track_changed_pages' is a GLOBAL variable -SELECT innodb_track_changed_pages = @@SESSION.innodb_track_changed_pages; -ERROR 42S22: Unknown column 'innodb_track_changed_pages' in 'field list' diff --git a/mysql-test/suite/sys_vars/r/innodb_track_redo_log_now_basic.result b/mysql-test/suite/sys_vars/r/innodb_track_redo_log_now_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_track_redo_log_now_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/innodb_use_stacktrace_basic.result b/mysql-test/suite/sys_vars/r/innodb_use_stacktrace_basic.result deleted file mode 100644 index 5db1880219d..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_use_stacktrace_basic.result +++ /dev/null @@ -1,48 +0,0 @@ -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); -COUNT(@@GLOBAL.innodb_use_stacktrace) -1 -1 Expected -SET @@GLOBAL.innodb_use_stacktrace=1; -ERROR HY000: Variable 'innodb_use_stacktrace' is a read only variable -Expected error 'Read only variable' -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); -COUNT(@@GLOBAL.innodb_use_stacktrace) -1 -1 Expected -SELECT IF(@@GLOBAL.innodb_use_stacktrace, 'ON', 'OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_stacktrace'; -IF(@@GLOBAL.innodb_use_stacktrace, 'ON', 'OFF') = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); -COUNT(@@GLOBAL.innodb_use_stacktrace) -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_stacktrace'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -SELECT @@innodb_use_stacktrace = @@GLOBAL.innodb_use_stacktrace; -@@innodb_use_stacktrace = @@GLOBAL.innodb_use_stacktrace -1 -1 Expected -SELECT COUNT(@@innodb_use_stacktrace); -COUNT(@@innodb_use_stacktrace) -1 -1 Expected -SELECT COUNT(@@local.innodb_use_stacktrace); -ERROR HY000: Variable 'innodb_use_stacktrace' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_use_stacktrace); -ERROR HY000: Variable 'innodb_use_stacktrace' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); -COUNT(@@GLOBAL.innodb_use_stacktrace) -1 -1 Expected -SELECT innodb_use_stacktrace = @@SESSION.innodb_use_stacktrace; -ERROR 42S22: Unknown column 'innodb_use_stacktrace' in 'field list' -Expected error 'Readonly variable' diff --git a/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result deleted file mode 100644 index d9d067c2cf9..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result +++ /dev/null @@ -1 +0,0 @@ -XtraDB extension diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled deleted file mode 100644 index f5ce4d77c6b..00000000000 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled +++ /dev/null @@ -1,1240 +0,0 @@ ---- suite/sys_vars/r/sysvars_innodb.result 2016-05-06 14:03:16.000000000 +0300 -+++ suite/sys_vars/r/sysvars_innodb,32bit.reject 2016-05-08 13:28:44.312418574 +0300 -@@ -47,13 +47,27 @@ - ENUM_VALUE_LIST OFF,ON - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS -+SESSION_VALUE NULL -+GLOBAL_VALUE 1 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Number of InnoDB adaptive hash index partitions (default 1: disable partitioning) -+NUMERIC_MIN_VALUE 1 -+NUMERIC_MAX_VALUE 32 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_ADAPTIVE_MAX_SLEEP_DELAY - SESSION_VALUE NULL - GLOBAL_VALUE 150000 - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 150000 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT The upper limit of the sleep delay in usec. Value of 0 disables it. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1000000 -@@ -67,10 +81,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 8388608 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT DEPRECATED. This option may be removed in future releases, together with the option innodb_use_sys_malloc and with the InnoDB's internal memory allocator. Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures. - NUMERIC_MIN_VALUE 524288 --NUMERIC_MAX_VALUE 9223372036854775807 -+NUMERIC_MAX_VALUE 2147483647 - NUMERIC_BLOCK_SIZE 1024 - ENUM_VALUE_LIST NULL - READ_ONLY YES -@@ -81,7 +95,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 5 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Background commit interval in seconds - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 1073741824 -@@ -137,7 +151,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT InnoDB API transaction isolation level - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 3 -@@ -151,7 +165,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 64 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Data file autoextend increment in megabytes - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 1000 -@@ -165,7 +179,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT The AUTOINC lock modes supported by InnoDB: 0 => Old style AUTOINC locking (for backward compatibility) 1 => New style AUTOINC locking 2 => No AUTOINC locking (unsafe for SBR) - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 2 -@@ -263,7 +277,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 100 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Dump only the hottest N% of each buffer pool, defaults to 100 - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 100 -@@ -305,7 +319,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT Number of buffer pool instances, set to higher value on high-end machines to increase scalability - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 64 -@@ -355,6 +369,20 @@ - ENUM_VALUE_LIST OFF,ON - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_BUFFER_POOL_POPULATE -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Deprecated. This option has no effect and will be removed in MariaDB 10.2.3. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_BUFFER_POOL_SIZE - SESSION_VALUE NULL - GLOBAL_VALUE 8388608 -@@ -375,7 +403,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed). - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 100 -@@ -446,7 +474,7 @@ - DEFAULT_VALUE ON - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE BOOLEAN --VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF. Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums. -+VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL -@@ -467,6 +495,104 @@ - ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_EVICTION_FACTOR -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make page cleaner LRU flushes use evicted instead of flushed page counts for its heuristics -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_CLEANER_FLUSH_CHUNK_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 100 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 100 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Divide page cleaner flush list flush batches into chunks of this size -+NUMERIC_MIN_VALUE 1 -+NUMERIC_MAX_VALUE 4294967295 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_FREE_LIST_LWM -+SESSION_VALUE NULL -+GLOBAL_VALUE 10 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 10 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Page cleaner will keep on flushing the same buffer pool instance if its free list length is below this percentage of innodb_lru_scan_depth -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 100 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_LRU_CHUNK_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 100 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 100 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Divide page cleaner LRU list flush batches into chunks of this size -+NUMERIC_MIN_VALUE 1 -+NUMERIC_MAX_VALUE 4294967295 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_LSN_AGE_FACTOR -+SESSION_VALUE NULL -+GLOBAL_VALUE HIGH_CHECKPOINT -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE HIGH_CHECKPOINT -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The formula for LSN age factor for page cleaner adaptive flushing. LEGACY: Original Oracle MySQL 5.6 formula. HIGH_CHECKPOINT: (the default) Percona Server 5.6 formula. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST LEGACY,HIGH_CHECKPOINT -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_CLEANER_MAX_FLUSH_TIME -+SESSION_VALUE NULL -+GLOBAL_VALUE 1000 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1000 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT The maximum time limit for a single flush list flush iteration by the page cleaner thread in miliseconds -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 4294967295 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_MAX_LRU_TIME -+SESSION_VALUE NULL -+GLOBAL_VALUE 1000 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1000 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT The maximum time limit for a single LRU tail flush iteration by the page cleaner thread in miliseconds -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 4294967295 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_CMP_PER_INDEX_ENABLED - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -487,7 +613,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Helps in performance tuning in heavily concurrent environments. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1000 -@@ -515,7 +641,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 5 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT If the compression failure rate of a table is greater than this number more padding is added to the pages to reduce the failures. A value of zero implies no padding - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 100 -@@ -543,7 +669,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 50 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Percentage of empty space on a data page that can be reserved to make the page compressible. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 75 -@@ -557,14 +683,28 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 5000 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket - NUMERIC_MIN_VALUE 1 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CORRUPT_TABLE_ACTION -+SESSION_VALUE NULL -+GLOBAL_VALUE assert -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE assert -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT Warn corruptions of user tables as 'corrupt table' instead of not crashing itself, when used with file_per_table. All file io for the datafile after detected as corrupt are disabled, except for the deletion. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST assert,warn,salvage -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_DATA_FILE_PATH - SESSION_VALUE NULL - GLOBAL_VALUE ibdata1:12M:autoextend -@@ -753,7 +893,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 120 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of pages reserved in doublewrite buffer for batch flushing - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 127 -@@ -761,6 +901,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_EMPTY_FREE_LIST_ALGORITHM -+SESSION_VALUE NULL -+GLOBAL_VALUE LEGACY -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE BACKOFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The algorithm to use for empty free list handling. Allowed values: LEGACY: Original Oracle MySQL 5.6 handling with single page flushes; BACKOFF: (default) Wait until cleaner produces a free page. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST LEGACY,BACKOFF -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_ENCRYPTION_ROTATE_KEY_AGE - SESSION_VALUE NULL - GLOBAL_VALUE 1 -@@ -831,13 +985,27 @@ - ENUM_VALUE_LIST OFF,ON,FORCE - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_FAKE_CHANGES -+SESSION_VALUE OFF -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE SESSION -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_FAST_SHUTDOWN - SESSION_VALUE NULL - GLOBAL_VALUE 1 - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like). - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 2 -@@ -851,7 +1019,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 600 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 4294967295 -@@ -921,7 +1089,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Make the first page of the given tablespace dirty. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 4294967295 -@@ -935,7 +1103,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 30 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of iterations over which the background flushing is averaged. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 1000 -@@ -958,12 +1126,12 @@ - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT --SESSION_VALUE NULL -+SESSION_VALUE 1 - GLOBAL_VALUE 1 - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 --VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_SCOPE SESSION -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 3 -@@ -991,7 +1159,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 2 -@@ -1033,7 +1201,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Helps to save your data in case the disk image of the database becomes corrupt. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 6 -@@ -1055,6 +1223,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_FOREGROUND_PREFLUSH -+SESSION_VALUE NULL -+GLOBAL_VALUE EXPONENTIAL_BACKOFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE EXPONENTIAL_BACKOFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The algorithm InnoDB uses for the query threads at sync preflush. Possible values are SYNC_PREFLUSH: perform a sync preflush as Oracle MySQL; EXPONENTIAL_BACKOFF: (default) wait for the page cleaner flush. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST SYNC_PREFLUSH,EXPONENTIAL_BACKOFF -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_FT_AUX_TABLE - SESSION_VALUE NULL - GLOBAL_VALUE -@@ -1075,7 +1257,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 8000000 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT InnoDB Fulltext search cache size in bytes - NUMERIC_MIN_VALUE 1600000 - NUMERIC_MAX_VALUE 80000000 -@@ -1117,7 +1299,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 84 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT InnoDB Fulltext search maximum token size in characters - NUMERIC_MIN_VALUE 10 - NUMERIC_MAX_VALUE 84 -@@ -1131,7 +1313,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 3 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT InnoDB Fulltext search minimum token size in characters - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 16 -@@ -1145,7 +1327,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 2000 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call - NUMERIC_MIN_VALUE 1000 - NUMERIC_MAX_VALUE 10000 -@@ -1159,7 +1341,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 2000000000 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT InnoDB Fulltext search query result cache limit in bytes - NUMERIC_MIN_VALUE 1000000 - NUMERIC_MAX_VALUE 4294967295 -@@ -1187,7 +1369,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 2 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 16 -@@ -1201,7 +1383,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 640000000 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Total memory allocated for InnoDB Fulltext Search cache - NUMERIC_MIN_VALUE 32000000 - NUMERIC_MAX_VALUE 1600000000 -@@ -1229,7 +1411,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 100 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 100 -@@ -1271,10 +1453,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 200 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of IOPs the server can do. Tunes the background IO rate - NUMERIC_MIN_VALUE 100 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -1283,12 +1465,26 @@ - SESSION_VALUE NULL - GLOBAL_VALUE 2000 - GLOBAL_VALUE_ORIGIN COMPILE-TIME --DEFAULT_VALUE 18446744073709551615 -+DEFAULT_VALUE 4294967295 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Limit to which innodb_io_capacity can be inflated. - NUMERIC_MIN_VALUE 100 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_KILL_IDLE_TRANSACTION -+SESSION_VALUE NULL -+GLOBAL_VALUE 0 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 0 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT -+VARIABLE_COMMENT No effect for this build. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 2147483647 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -1321,6 +1517,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOCKING_FAKE_CHANGES -+SESSION_VALUE NULL -+GLOBAL_VALUE ON -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE ON -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT ###EXPERIMENTAL### if enabled, transactions will get S row locks instead of X locks for fake changes. If disabled, fake change transactions will not take any locks at all. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_LOCKS_UNSAFE_FOR_BINLOG - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -1341,7 +1551,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 50 - VARIABLE_SCOPE SESSION --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 1073741824 -@@ -1349,35 +1559,105 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED --VARIABLE_NAME INNODB_LOG_BUFFER_SIZE --SESSION_VALUE NULL --GLOBAL_VALUE 1048576 --GLOBAL_VALUE_ORIGIN CONFIG --DEFAULT_VALUE 16777216 --VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT --VARIABLE_COMMENT The size of the buffer which InnoDB uses to write log to the log files on disk. --NUMERIC_MIN_VALUE 262144 --NUMERIC_MAX_VALUE 9223372036854775807 --NUMERIC_BLOCK_SIZE 1024 --ENUM_VALUE_LIST NULL --READ_ONLY YES --COMMAND_LINE_ARGUMENT REQUIRED --VARIABLE_NAME INNODB_LOG_CHECKPOINT_NOW -+VARIABLE_NAME INNODB_LOG_ARCHIVE - SESSION_VALUE NULL - GLOBAL_VALUE OFF - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE OFF - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE BOOLEAN --VARIABLE_COMMENT Force checkpoint now -+VARIABLE_COMMENT Set to 1 if you want to have logs archived. - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL - ENUM_VALUE_LIST OFF,ON - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL --VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES -+VARIABLE_NAME INNODB_LOG_ARCH_DIR -+SESSION_VALUE NULL -+GLOBAL_VALUE PATH -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE VARCHAR -+VARIABLE_COMMENT Where full logs should be archived. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST NULL -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOG_ARCH_EXPIRE_SEC -+SESSION_VALUE NULL -+GLOBAL_VALUE 0 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 0 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Expiration time for archived innodb transaction logs. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 4294967295 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_LOG_BLOCK_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 512 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 512 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT ###EXPERIMENTAL###: The log block size of the transaction log file. Changing for created log file is not supported. Use on your own risk! -+NUMERIC_MIN_VALUE 512 -+NUMERIC_MAX_VALUE 65536 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOG_BUFFER_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 1048576 -+GLOBAL_VALUE_ORIGIN CONFIG -+DEFAULT_VALUE 16777216 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT -+VARIABLE_COMMENT The size of the buffer which InnoDB uses to write log to the log files on disk. -+NUMERIC_MIN_VALUE 262144 -+NUMERIC_MAX_VALUE 2147483647 -+NUMERIC_BLOCK_SIZE 1024 -+ENUM_VALUE_LIST NULL -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOG_CHECKPOINT_NOW -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Force checkpoint now -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_LOG_CHECKSUM_ALGORITHM -+SESSION_VALUE NULL -+GLOBAL_VALUE INNODB -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE INNODB -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The algorithm InnoDB uses for log block checksums. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Logs created when this option is set to crc32/strict_crc32/none/strict_none will not be readable by any MySQL version or Percona Server versions that donot support this feature -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES - SESSION_VALUE NULL - GLOBAL_VALUE OFF - GLOBAL_VALUE_ORIGIN COMPILE-TIME -@@ -1397,7 +1677,7 @@ - GLOBAL_VALUE_ORIGIN CONFIG - DEFAULT_VALUE 2 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of log files in the log group. InnoDB writes to the files in a circular fashion. - NUMERIC_MIN_VALUE 2 - NUMERIC_MAX_VALUE 100 -@@ -1439,9 +1719,37 @@ - GLOBAL_VALUE_ORIGIN CONFIG - DEFAULT_VALUE 1024 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT How deep to scan LRU to keep it clean - NUMERIC_MIN_VALUE 100 -+NUMERIC_MAX_VALUE 4294967295 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_MAX_BITMAP_FILE_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 104857600 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 104857600 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT The maximum size of changed page bitmap files -+NUMERIC_MIN_VALUE 4096 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_MAX_CHANGED_PAGES -+SESSION_VALUE NULL -+GLOBAL_VALUE 1000000 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1000000 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT The maximum number of rows for INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, 0 - unlimited -+NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 18446744073709551615 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL -@@ -1481,10 +1789,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Desired maximum length of the purge queue (0 = no limit) - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -1495,7 +1803,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Maximum delay of user threads in micro-seconds - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 10000000 -@@ -1509,7 +1817,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT Number of identical copies of log groups we keep for the database. Currently this should be set to 1. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 10 -@@ -1579,7 +1887,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 8 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT Number of multi-threaded flush threads - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 64 -@@ -1635,10 +1943,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT -+VARIABLE_TYPE INT - VARIABLE_COMMENT How many files at the maximum InnoDB keeps open at the same time. - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 9223372036854775807 -+NUMERIC_MAX_VALUE 2147483647 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY YES -@@ -1663,7 +1971,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 16 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of rw_locks protecting buffer pool page_hash. Rounded up to the next power of 2 - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 1024 -@@ -1677,7 +1985,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 16384 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Page size to use for all InnoDB tablespaces. - NUMERIC_MIN_VALUE 4096 - NUMERIC_MAX_VALUE 65536 -@@ -1713,13 +2021,69 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_CLEANER -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make buffer pool cleaner and LRU manager threads acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_IO -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make I/O threads acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_MASTER -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make buffer pool cleaner thread acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_PURGE -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make purge coordinator and worker threads acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_PURGE_BATCH_SIZE - SESSION_VALUE NULL - GLOBAL_VALUE 300 - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 300 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 5000 -@@ -1761,7 +2125,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Purge threads can be from 1 to 32. Default is 1. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 32 -@@ -1789,7 +2153,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 56 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 64 -@@ -1803,7 +2167,7 @@ - GLOBAL_VALUE_ORIGIN CONFIG - DEFAULT_VALUE 4 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of background read I/O threads in InnoDB. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 64 -@@ -1831,10 +2195,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Replication thread delay (ms) on the slave server if innodb_thread_concurrency is reached (0 by default) - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -1859,7 +2223,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 128 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of undo logs to use (deprecated). - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 128 -@@ -1873,7 +2237,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT An InnoDB page number. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 4294967295 -@@ -1881,6 +2245,48 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_SCHED_PRIORITY_IO -+SESSION_VALUE NULL -+GLOBAL_VALUE 19 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 19 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Nice value for the I/O handler thread scheduling -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 39 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_SCHED_PRIORITY_MASTER -+SESSION_VALUE NULL -+GLOBAL_VALUE 19 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 19 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Nice value for the master thread scheduling -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 39 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_SCHED_PRIORITY_PURGE -+SESSION_VALUE NULL -+GLOBAL_VALUE 19 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 19 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Nice value for the purge thread scheduling -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 39 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_SCRUB_LOG - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -1909,6 +2315,34 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_SHOW_LOCKS_HELD -+SESSION_VALUE NULL -+GLOBAL_VALUE 10 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 10 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Number of locks held to print for each InnoDB transaction in SHOW INNODB STATUS. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 1000 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_SHOW_VERBOSE_LOCKS -+SESSION_VALUE NULL -+GLOBAL_VALUE 0 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 0 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE INT UNSIGNED -+VARIABLE_COMMENT Whether to show records locked in SHOW INNODB STATUS. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 1 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_SIMULATE_COMP_FAILURES - SESSION_VALUE NULL - GLOBAL_VALUE 0 -@@ -1929,7 +2363,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1048576 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Memory buffer size for index creation - NUMERIC_MIN_VALUE 65536 - NUMERIC_MAX_VALUE 67108864 -@@ -1943,10 +2377,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 6 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Maximum delay between polling for a spin lock (6 by default) - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -1972,7 +2406,7 @@ - DEFAULT_VALUE nulls_equal - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE ENUM --VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs. Possible values are NULLS_EQUAL (default), NULLS_UNEQUAL and NULLS_IGNORED -+VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL -@@ -2139,7 +2573,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Size of the mutex/lock wait array. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 1024 -@@ -2153,10 +2587,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 30 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Count of spin-loop rounds in InnoDB mutexes (30 by default) - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -2181,7 +2615,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Helps in performance tuning in heavily concurrent environments. Sets the maximum number of threads allowed inside InnoDB. Value 0 will disable the thread throttling. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1000 -@@ -2195,7 +2629,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 10000 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1000000 -@@ -2217,6 +2651,34 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_TRACK_CHANGED_PAGES -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Track the redo log for changed pages and output a changed page bitmap -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT NONE -+VARIABLE_NAME INNODB_TRACK_REDO_LOG_NOW -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Force log tracker to catch up with checkpoint now -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -2265,7 +2727,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 128 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of undo logs to use. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 128 -@@ -2279,7 +2741,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of undo tablespaces to use. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 126 -@@ -2294,7 +2756,7 @@ - DEFAULT_VALUE OFF - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE BOOLEAN --VARIABLE_COMMENT Prevent partial page writes, via atomic writes.The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer.Currently this option works only on Linux only with FusionIO device, and directFS filesystem. -+VARIABLE_COMMENT Prevent partial page writes, via atomic writes (beta). The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer. Currently this option works only on Linux only with FusionIO device, and directFS filesystem. - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL -@@ -2315,6 +2777,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT NONE -+VARIABLE_NAME INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT -+SESSION_VALUE NULL -+GLOBAL_VALUE ON -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE ON -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Use global innodb_flush_log_at_trx_commit value. (default: ON). -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_USE_MTFLUSH - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -2329,6 +2805,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT NONE -+VARIABLE_NAME INNODB_USE_STACKTRACE -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Print stacktrace on long semaphore wait (off by default supported only on linux) -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_USE_SYS_MALLOC - SESSION_VALUE NULL - GLOBAL_VALUE ON -@@ -2359,12 +2849,12 @@ - COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_VERSION - SESSION_VALUE NULL --GLOBAL_VALUE 5.6.36 -+GLOBAL_VALUE 5.6.36-82.0 - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE NULL - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE VARCHAR --VARIABLE_COMMENT InnoDB version -+VARIABLE_COMMENT Percona-InnoDB-plugin version - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL -@@ -2377,7 +2867,7 @@ - GLOBAL_VALUE_ORIGIN CONFIG - DEFAULT_VALUE 4 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Number of background write I/O threads in InnoDB. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 64 diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled deleted file mode 100644 index 9199653b460..00000000000 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled +++ /dev/null @@ -1,674 +0,0 @@ ---- suite/sys_vars/r/sysvars_innodb.result -+++ suite/sys_vars/r/sysvars_innodb,xtradb.reject -@@ -47,6 +47,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS -+SESSION_VALUE NULL -+GLOBAL_VALUE 1 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Number of InnoDB adaptive hash index partitions (default 1: disable partitioning) -+NUMERIC_MIN_VALUE 1 -+NUMERIC_MAX_VALUE 64 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_ADAPTIVE_MAX_SLEEP_DELAY - SESSION_VALUE NULL - GLOBAL_VALUE 150000 -@@ -355,6 +369,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_BUFFER_POOL_POPULATE -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Deprecated. This option has no effect and will be removed in MariaDB 10.2.3. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_BUFFER_POOL_SIZE - SESSION_VALUE NULL - GLOBAL_VALUE 8388608 -@@ -446,7 +474,7 @@ - DEFAULT_VALUE ON - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE BOOLEAN --VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF. Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums. -+VARIABLE_COMMENT DEPRECATED. Use innodb_checksum_algorithm=NONE instead of setting this to OFF - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL -@@ -467,6 +495,104 @@ - ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_EVICTION_FACTOR -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make page cleaner LRU flushes use evicted instead of flushed page counts for its heuristics -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_CLEANER_FLUSH_CHUNK_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 100 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 100 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Divide page cleaner flush list flush batches into chunks of this size -+NUMERIC_MIN_VALUE 1 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_FREE_LIST_LWM -+SESSION_VALUE NULL -+GLOBAL_VALUE 10 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 10 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Page cleaner will keep on flushing the same buffer pool instance if its free list length is below this percentage of innodb_lru_scan_depth -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 100 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_LRU_CHUNK_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 100 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 100 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Divide page cleaner LRU list flush batches into chunks of this size -+NUMERIC_MIN_VALUE 1 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_LSN_AGE_FACTOR -+SESSION_VALUE NULL -+GLOBAL_VALUE HIGH_CHECKPOINT -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE HIGH_CHECKPOINT -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The formula for LSN age factor for page cleaner adaptive flushing. LEGACY: Original Oracle MySQL 5.6 formula. HIGH_CHECKPOINT: (the default) Percona Server 5.6 formula. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST LEGACY,HIGH_CHECKPOINT -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_CLEANER_MAX_FLUSH_TIME -+SESSION_VALUE NULL -+GLOBAL_VALUE 1000 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1000 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT The maximum time limit for a single flush list flush iteration by the page cleaner thread in miliseconds -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CLEANER_MAX_LRU_TIME -+SESSION_VALUE NULL -+GLOBAL_VALUE 1000 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1000 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT The maximum time limit for a single LRU tail flush iteration by the page cleaner thread in miliseconds -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_CMP_PER_INDEX_ENABLED - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -565,6 +691,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_CORRUPT_TABLE_ACTION -+SESSION_VALUE NULL -+GLOBAL_VALUE assert -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE assert -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT Warn corruptions of user tables as 'corrupt table' instead of not crashing itself, when used with file_per_table. All file io for the datafile after detected as corrupt are disabled, except for the deletion. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST assert,warn,salvage -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_DATA_FILE_PATH - SESSION_VALUE NULL - GLOBAL_VALUE ibdata1:12M:autoextend -@@ -761,6 +901,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_EMPTY_FREE_LIST_ALGORITHM -+SESSION_VALUE NULL -+GLOBAL_VALUE LEGACY -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE BACKOFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The algorithm to use for empty free list handling. Allowed values: LEGACY: Original Oracle MySQL 5.6 handling with single page flushes; BACKOFF: (default) Wait until cleaner produces a free page. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST LEGACY,BACKOFF -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_ENCRYPTION_ROTATE_KEY_AGE - SESSION_VALUE NULL - GLOBAL_VALUE 1 -@@ -831,6 +985,20 @@ - ENUM_VALUE_LIST OFF,ON,FORCE - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_FAKE_CHANGES -+SESSION_VALUE OFF -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE SESSION -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_FAST_SHUTDOWN - SESSION_VALUE NULL - GLOBAL_VALUE 1 -@@ -958,11 +1126,11 @@ - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_FLUSH_LOG_AT_TRX_COMMIT --SESSION_VALUE NULL -+SESSION_VALUE 1 - GLOBAL_VALUE 1 - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 1 --VARIABLE_SCOPE GLOBAL -+VARIABLE_SCOPE SESSION - VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3. - NUMERIC_MIN_VALUE 0 -@@ -1055,6 +1223,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_FOREGROUND_PREFLUSH -+SESSION_VALUE NULL -+GLOBAL_VALUE EXPONENTIAL_BACKOFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE EXPONENTIAL_BACKOFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The algorithm InnoDB uses for the query threads at sync preflush. Possible values are SYNC_PREFLUSH: perform a sync preflush as Oracle MySQL; EXPONENTIAL_BACKOFF: (default) wait for the page cleaner flush. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST SYNC_PREFLUSH,EXPONENTIAL_BACKOFF -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_FT_AUX_TABLE - SESSION_VALUE NULL - GLOBAL_VALUE -@@ -1293,6 +1475,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_KILL_IDLE_TRANSACTION -+SESSION_VALUE NULL -+GLOBAL_VALUE 0 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 0 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT -+VARIABLE_COMMENT No effect for this build. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 9223372036854775807 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_LARGE_PREFIX - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -1321,6 +1517,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOCKING_FAKE_CHANGES -+SESSION_VALUE NULL -+GLOBAL_VALUE ON -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE ON -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT ###EXPERIMENTAL### if enabled, transactions will get S row locks instead of X locks for fake changes. If disabled, fake change transactions will not take any locks at all. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_LOCKS_UNSAFE_FOR_BINLOG - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -1349,6 +1559,62 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOG_ARCHIVE -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Set to 1 if you want to have logs archived. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_LOG_ARCH_DIR -+SESSION_VALUE NULL -+GLOBAL_VALUE PATH -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE VARCHAR -+VARIABLE_COMMENT Where full logs should be archived. -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST NULL -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_LOG_ARCH_EXPIRE_SEC -+SESSION_VALUE NULL -+GLOBAL_VALUE 0 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 0 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Expiration time for archived innodb transaction logs. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_LOG_BLOCK_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 512 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 512 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT ###EXPERIMENTAL###: The log block size of the transaction log file. Changing for created log file is not supported. Use on your own risk! -+NUMERIC_MIN_VALUE 512 -+NUMERIC_MAX_VALUE 65536 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_LOG_BUFFER_SIZE - SESSION_VALUE NULL - GLOBAL_VALUE 1048576 -@@ -1377,6 +1643,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_LOG_CHECKSUM_ALGORITHM -+SESSION_VALUE NULL -+GLOBAL_VALUE INNODB -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE INNODB -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE ENUM -+VARIABLE_COMMENT The algorithm InnoDB uses for log block checksums. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Logs created when this option is set to crc32/strict_crc32/none/strict_none will not be readable by any MySQL version or Percona Server versions that donot support this feature -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -1447,6 +1727,34 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_MAX_BITMAP_FILE_SIZE -+SESSION_VALUE NULL -+GLOBAL_VALUE 104857600 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 104857600 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT The maximum size of changed page bitmap files -+NUMERIC_MIN_VALUE 4096 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_MAX_CHANGED_PAGES -+SESSION_VALUE NULL -+GLOBAL_VALUE 1000000 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 1000000 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT The maximum number of rows for INFORMATION_SCHEMA.INNODB_CHANGED_PAGES table, 0 - unlimited -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_MAX_DIRTY_PAGES_PCT - SESSION_VALUE NULL - GLOBAL_VALUE 75.000000 -@@ -1713,6 +2021,62 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_CLEANER -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make buffer pool cleaner and LRU manager threads acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_IO -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make I/O threads acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_MASTER -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make buffer pool cleaner thread acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_PRIORITY_PURGE -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Make purge coordinator and worker threads acquire shared resources with priority -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_PURGE_BATCH_SIZE - SESSION_VALUE NULL - GLOBAL_VALUE 300 -@@ -1881,6 +2245,48 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_SCHED_PRIORITY_IO -+SESSION_VALUE NULL -+GLOBAL_VALUE 19 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 19 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Nice value for the I/O handler thread scheduling -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 39 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_SCHED_PRIORITY_MASTER -+SESSION_VALUE NULL -+GLOBAL_VALUE 19 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 19 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Nice value for the master thread scheduling -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 39 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_SCHED_PRIORITY_PURGE -+SESSION_VALUE NULL -+GLOBAL_VALUE 19 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 19 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Nice value for the purge thread scheduling -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 39 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED - VARIABLE_NAME INNODB_SCRUB_LOG - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -1909,6 +2315,34 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_SHOW_LOCKS_HELD -+SESSION_VALUE NULL -+GLOBAL_VALUE 10 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 10 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Number of locks held to print for each InnoDB transaction in SHOW INNODB STATUS. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 1000 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT REQUIRED -+VARIABLE_NAME INNODB_SHOW_VERBOSE_LOCKS -+SESSION_VALUE NULL -+GLOBAL_VALUE 0 -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE 0 -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_COMMENT Whether to show records locked in SHOW INNODB STATUS. -+NUMERIC_MIN_VALUE 0 -+NUMERIC_MAX_VALUE 1 -+NUMERIC_BLOCK_SIZE 0 -+ENUM_VALUE_LIST NULL -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_SIMULATE_COMP_FAILURES - SESSION_VALUE NULL - GLOBAL_VALUE 0 -@@ -1972,7 +2406,7 @@ - DEFAULT_VALUE nulls_equal - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE ENUM --VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs. Possible values are NULLS_EQUAL (default), NULLS_UNEQUAL and NULLS_IGNORED -+VARIABLE_COMMENT Specifies how InnoDB index statistics collection code should treat NULLs - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL -@@ -2217,6 +2651,34 @@ - ENUM_VALUE_LIST NULL - READ_ONLY NO - COMMAND_LINE_ARGUMENT OPTIONAL -+VARIABLE_NAME INNODB_TRACK_CHANGED_PAGES -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Track the redo log for changed pages and output a changed page bitmap -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT NONE -+VARIABLE_NAME INNODB_TRACK_REDO_LOG_NOW -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Force log tracker to catch up with checkpoint now -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -2294,7 +2756,7 @@ - DEFAULT_VALUE OFF - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE BOOLEAN --VARIABLE_COMMENT Prevent partial page writes, via atomic writes.The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer.Currently this option works only on Linux only with FusionIO device, and directFS filesystem. -+VARIABLE_COMMENT Prevent partial page writes, via atomic writes (beta). The option is used to prevent partial writes in case of a crash/poweroff, as faster alternative to doublewrite buffer. Currently this option works only on Linux only with FusionIO device, and directFS filesystem. - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL -@@ -2315,6 +2777,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT NONE -+VARIABLE_NAME INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT -+SESSION_VALUE NULL -+GLOBAL_VALUE ON -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE ON -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Use global innodb_flush_log_at_trx_commit value. (default: ON). -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY NO -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_USE_MTFLUSH - SESSION_VALUE NULL - GLOBAL_VALUE OFF -@@ -2329,6 +2805,20 @@ - ENUM_VALUE_LIST NULL - READ_ONLY YES - COMMAND_LINE_ARGUMENT NONE -+VARIABLE_NAME INNODB_USE_STACKTRACE -+SESSION_VALUE NULL -+GLOBAL_VALUE OFF -+GLOBAL_VALUE_ORIGIN COMPILE-TIME -+DEFAULT_VALUE OFF -+VARIABLE_SCOPE GLOBAL -+VARIABLE_TYPE BOOLEAN -+VARIABLE_COMMENT Print stacktrace on long semaphore wait (off by default supported only on linux) -+NUMERIC_MIN_VALUE NULL -+NUMERIC_MAX_VALUE NULL -+NUMERIC_BLOCK_SIZE NULL -+ENUM_VALUE_LIST OFF,ON -+READ_ONLY YES -+COMMAND_LINE_ARGUMENT NONE - VARIABLE_NAME INNODB_USE_SYS_MALLOC - SESSION_VALUE NULL - GLOBAL_VALUE ON -@@ -2359,12 +2849,12 @@ - COMMAND_LINE_ARGUMENT OPTIONAL - VARIABLE_NAME INNODB_VERSION - SESSION_VALUE NULL --GLOBAL_VALUE 5.6.36 -+GLOBAL_VALUE 5.6.36-82.0 - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE NULL - VARIABLE_SCOPE GLOBAL - VARIABLE_TYPE VARCHAR --VARIABLE_COMMENT InnoDB version -+VARIABLE_COMMENT Percona-InnoDB-plugin version - NUMERIC_MIN_VALUE NULL - NUMERIC_MAX_VALUE NULL - NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/t/all_vars.test b/mysql-test/suite/sys_vars/t/all_vars.test index 7b9f69bd7d1..c0127e1ef12 100644 --- a/mysql-test/suite/sys_vars/t/all_vars.test +++ b/mysql-test/suite/sys_vars/t/all_vars.test @@ -12,7 +12,7 @@ eval INSTALL PLUGIN blackhole SONAME "$HA_BLACKHOLE_SO"; eval INSTALL PLUGIN federated SONAME "$HA_FEDERATEDX_SO"; eval INSTALL PLUGIN oqgraph SONAME "$HA_OQGRAPH_SO"; eval INSTALL PLUGIN sphinx SONAME "$HA_SPHINX_SO"; -eval INSTALL PLUGIN innodb SONAME "$HA_XTRADB_SO"; +eval INSTALL PLUGIN innodb SONAME "$HA_INNODB_SO"; eval INSTALL PLUGIN rpl_semi_sync_master SONAME "$SEMISYNC_MASTER_SO"; eval INSTALL PLUGIN rpl_semi_sync_slave SONAME "$SEMISYNC_SLAVE_SO"; --enable_abort_on_error diff --git a/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_blocking_buffer_pool_restore_basic.test b/mysql-test/suite/sys_vars/t/innodb_blocking_buffer_pool_restore_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_blocking_buffer_pool_restore_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_populate_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_populate_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_populate_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test b/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test b/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test b/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test b/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_fake_changes_basic.test b/mysql-test/suite/sys_vars/t/innodb_fake_changes_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_fake_changes_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_flush_checkpoint_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_checkpoint_debug_basic.test deleted file mode 100644 index 093a765e0e5..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_flush_checkpoint_debug_basic.test +++ /dev/null @@ -1,12 +0,0 @@ ---source include/have_debug.inc ---source include/have_xtradb.inc - -SELECT @@global.innodb_flush_checkpoint_debug; -SET @@global.innodb_flush_checkpoint_debug=1; -SELECT @@global.innodb_flush_checkpoint_debug; -SET @@global.innodb_flush_checkpoint_debug=0; -SELECT @@global.innodb_flush_checkpoint_debug; ---error ER_GLOBAL_VARIABLE -SET @@session.innodb_flush_checkpoint_debug=1; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.innodb_flush_checkpoint_debug; diff --git a/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test b/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test b/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test b/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_kill_idle_transaction_basic.test b/mysql-test/suite/sys_vars/t/innodb_kill_idle_transaction_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_kill_idle_transaction_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test b/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test b/mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_max_bitmap_file_size_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test b/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test b/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test b/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_sched_priority_cleaner_basic.test b/mysql-test/suite/sys_vars/t/innodb_sched_priority_cleaner_basic.test deleted file mode 100644 index 2c2037f167f..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_sched_priority_cleaner_basic.test +++ /dev/null @@ -1,51 +0,0 @@ ---source include/have_xtradb.inc ---source include/linux.inc ---source include/not_embedded.inc - -# A dynamic, global variable - -# Test in read-only mode ---let $restart_parameters= --innodb-read-only ---source include/restart_mysqld.inc ---let $restart_parameters= - -# This has no actual effect in innodb_read_only mode -SET GLOBAL innodb_sched_priority_cleaner=39; - ---source include/restart_mysqld.inc - -# Default value -SELECT @@GLOBAL.innodb_sched_priority_cleaner; - -# Global only ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@SESSION.innodb_sched_priority_cleaner; - -# Correct values -# The high priority values may need permissions, thus do not test them -# SET GLOBAL innodb_sched_priority_cleaner=39; -# SELECT @@GLOBAL.innodb_sched_priority_cleaner; -#SET GLOBAL innodb_sched_priority_cleaner=34; -# SELECT @@GLOBAL.innodb_sched_priority_cleaner; -SET GLOBAL innodb_sched_priority_cleaner=19; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -SET GLOBAL innodb_sched_priority_cleaner=5; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -SET GLOBAL innodb_sched_priority_cleaner=0; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; - -# Incorrect values -SET GLOBAL innodb_sched_priority_cleaner=-1; -SELECT @@GLOBAL.innodb_sched_priority_cleaner; -#SET GLOBAL innodb_sched_priority_cleaner=40; -#SELECT @@GLOBAL.innodb_sched_priority_cleaner; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_cleaner=1.1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_cleaner=1e1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_cleaner='foo'; - -# If we are lacking permissions, then we cannot restore the startup value -# at the end. ---source include/restart_mysqld.inc diff --git a/mysql-test/suite/sys_vars/t/innodb_sched_priority_io_basic.test b/mysql-test/suite/sys_vars/t/innodb_sched_priority_io_basic.test deleted file mode 100644 index f77816e84c2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_sched_priority_io_basic.test +++ /dev/null @@ -1,44 +0,0 @@ ---source include/have_debug.inc ---source include/have_xtradb.inc ---source include/linux.inc ---source include/not_embedded.inc - -# A dynamic, global variable - -SET @start_value = @@GLOBAL.innodb_sched_priority_io; - -# Default value -SELECT @@GLOBAL.innodb_sched_priority_io; - -# Global only ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@SESSION.innodb_sched_priority_io; - -# Correct values -# The high priority values may need permissions, thus do not test them -# SET GLOBAL innodb_sched_priority_io=39; -# SELECT @@GLOBAL.innodb_sched_priority_io; -#SET GLOBAL innodb_sched_priority_io=34; -# SELECT @@GLOBAL.innodb_sched_priorit_io; -SET GLOBAL innodb_sched_priority_io=19; -SELECT @@GLOBAL.innodb_sched_priority_io; -SET GLOBAL innodb_sched_priority_io=5; -SELECT @@GLOBAL.innodb_sched_priority_io; -SET GLOBAL innodb_sched_priority_io=0; -SELECT @@GLOBAL.innodb_sched_priority_io; - -# Incorrect values -SET GLOBAL innodb_sched_priority_io=-1; -SELECT @@GLOBAL.innodb_sched_priority_io; -#SET GLOBAL innodb_sched_priority_io=40; -#SELECT @@GLOBAL.innodb_sched_priority_io; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_io=1.1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_io=1e1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_io='foo'; - -# If we are lacking permissions, then we cannot restore the startup value -# at the end. ---source include/restart_mysqld.inc diff --git a/mysql-test/suite/sys_vars/t/innodb_sched_priority_master_basic.test b/mysql-test/suite/sys_vars/t/innodb_sched_priority_master_basic.test deleted file mode 100644 index 150e7e5793d..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_sched_priority_master_basic.test +++ /dev/null @@ -1,44 +0,0 @@ ---source include/have_debug.inc ---source include/have_xtradb.inc ---source include/linux.inc ---source include/not_embedded.inc - -# A dynamic, global variable - -SET @start_value = @@GLOBAL.innodb_sched_priority_master; - -# Default value -SELECT @@GLOBAL.innodb_sched_priority_master; - -# Global only ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@SESSION.innodb_sched_priority_master; - -# Correct values -# The high priority values may need permissions, thus do not test them -# SET GLOBAL innodb_sched_priority_master=39; -# SELECT @@GLOBAL.innodb_sched_priority_master; -#SET GLOBAL innodb_sched_priority_master=34; -# SELECT @@GLOBAL.innodb_sched_priority_master; -SET GLOBAL innodb_sched_priority_master=19; -SELECT @@GLOBAL.innodb_sched_priority_master; -SET GLOBAL innodb_sched_priority_master=5; -SELECT @@GLOBAL.innodb_sched_priority_master; -SET GLOBAL innodb_sched_priority_master=0; -SELECT @@GLOBAL.innodb_sched_priority_master; - -# Incorrect values -SET GLOBAL innodb_sched_priority_master=-1; -SELECT @@GLOBAL.innodb_sched_priority_master; -#SET GLOBAL innodb_sched_priority_master=40; -#SELECT @@GLOBAL.innodb_sched_priority_master; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_master=1.1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_master=1e1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_master='foo'; - -# If we are lacking permissions, then we cannot restore the startup value -# at the end. ---source include/restart_mysqld.inc diff --git a/mysql-test/suite/sys_vars/t/innodb_sched_priority_purge_basic.test b/mysql-test/suite/sys_vars/t/innodb_sched_priority_purge_basic.test deleted file mode 100644 index bc37e4ee568..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_sched_priority_purge_basic.test +++ /dev/null @@ -1,44 +0,0 @@ ---source include/have_debug.inc ---source include/have_xtradb.inc ---source include/linux.inc ---source include/not_embedded.inc - -# A dynamic, global variable - -SET @start_value = @@GLOBAL.innodb_sched_priority_purge; - -# Default value -SELECT @@GLOBAL.innodb_sched_priority_purge; - -# Global only ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@SESSION.innodb_sched_priority_purge; - -# Correct values -# The high priority values may need permissions, thus do not test them -# SET GLOBAL innodb_sched_priority_purge=39; -# SELECT @@GLOBAL.innodb_sched_priority_purge; -#SET GLOBAL innodb_sched_priority_purge=34; -# SELECT @@GLOBAL.innodb_sched_priority_purge; -SET GLOBAL innodb_sched_priority_purge=19; -SELECT @@GLOBAL.innodb_sched_priority_purge; -SET GLOBAL innodb_sched_priority_purge=5; -SELECT @@GLOBAL.innodb_sched_priority_purge; -SET GLOBAL innodb_sched_priority_purge=0; -SELECT @@GLOBAL.innodb_sched_priority_purge; - -# Incorrect values -SET GLOBAL innodb_sched_priority_purge=-1; -SELECT @@GLOBAL.innodb_sched_priority_purge; -#SET GLOBAL innodb_sched_priority_purge=40; -#SELECT @@GLOBAL.innodb_sched_priority_purge; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_purge=1.1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_purge=1e1; ---error ER_WRONG_TYPE_FOR_VAR -SET GLOBAL innodb_sched_priority_purge='foo'; - -# If we are lacking permissions, then we cannot restore the startup value -# at the end. ---source include/restart_mysqld.inc diff --git a/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test b/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test b/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test b/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test b/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_tmpdir_basic.test b/mysql-test/suite/sys_vars/t/innodb_tmpdir_basic.test index 3c547152e27..2f9da412a06 100644 --- a/mysql-test/suite/sys_vars/t/innodb_tmpdir_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_tmpdir_basic.test @@ -1,10 +1,5 @@ --source include/have_innodb.inc -if (`select plugin_auth_version <= "5.6.28-MariaDB-76.1" from information_schema.plugins where plugin_name='innodb'`) -{ - --skip Not fixed in XtraDB as of 5.6.28-MariaDB-76.1 or earlier -} - SET @start_global_value = @@global.innodb_tmpdir; SELECT @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test b/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test deleted file mode 100644 index daf15922498..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test +++ /dev/null @@ -1,18 +0,0 @@ -# Tests for innodb_track_changed_pages variable - ---source include/have_xtradb.inc - -SELECT COUNT(@@GLOBAL.innodb_track_changed_pages); - -SELECT @@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_track_changed_pages'; - -SELECT @@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages; - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_track_changed_pages); ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@LOCAL.innodb_track_changed_pages); ---error ER_BAD_FIELD_ERROR -SELECT innodb_track_changed_pages = @@SESSION.innodb_track_changed_pages; diff --git a/mysql-test/suite/sys_vars/t/innodb_track_redo_log_now_basic.test b/mysql-test/suite/sys_vars/t/innodb_track_redo_log_now_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_track_redo_log_now_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/suite/sys_vars/t/innodb_use_stacktrace_basic.test b/mysql-test/suite/sys_vars/t/innodb_use_stacktrace_basic.test deleted file mode 100644 index b7da1dae3d4..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_use_stacktrace_basic.test +++ /dev/null @@ -1,56 +0,0 @@ ---source include/have_xtradb.inc - -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); ---echo 1 Expected - -#################################################################### -# Check if Value can set # -#################################################################### - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@GLOBAL.innodb_use_stacktrace=1; ---echo Expected error 'Read only variable' - -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); ---echo 1 Expected - -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - -SELECT IF(@@GLOBAL.innodb_use_stacktrace, 'ON', 'OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_stacktrace'; ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); ---echo 1 Expected - -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_stacktrace'; ---echo 1 Expected - -################################################################################ -# Check if accessing variable with and without GLOBAL point to same variable # -################################################################################ -SELECT @@innodb_use_stacktrace = @@GLOBAL.innodb_use_stacktrace; ---echo 1 Expected - -SELECT COUNT(@@innodb_use_stacktrace); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_use_stacktrace); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_use_stacktrace); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.innodb_use_stacktrace); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_use_stacktrace = @@SESSION.innodb_use_stacktrace; ---echo Expected error 'Readonly variable' diff --git a/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test b/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test deleted file mode 100644 index 00aa476e8d2..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test +++ /dev/null @@ -1 +0,0 @@ ---echo XtraDB extension diff --git a/mysql-test/t/information_schema-big.test b/mysql-test/t/information_schema-big.test index 717c22f8f6a..9212348649e 100644 --- a/mysql-test/t/information_schema-big.test +++ b/mysql-test/t/information_schema-big.test @@ -1,18 +1,12 @@ # This test uses grants, which can't get tested for embedded server -- source include/big_test.inc -- source include/not_embedded.inc --- source include/have_xtradb.inc +-- source include/have_innodb.inc # check that CSV engine was compiled in, as the result of the test depends # on the presence of the log tables (which are CSV-based). --source include/have_csv.inc ---disable_warnings -DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5; -DROP VIEW IF EXISTS v1; ---enable_warnings - - --echo # --echo # Bug#18925: subqueries with MIN/MAX functions on INFORMATION_SCHEMA --echo # diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index c5c244bf533..48ca6184c50 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -242,7 +242,6 @@ innodb.innodb_stats_del_mark : Added in 10.2.6 innodb.innodb_sys_semaphore_waits : MDEV-10331 - Semaphore wait innodb.innodb-virtual-columns2 : Added in 10.2.6 innodb.innodb-wl5522-debug : Modified in 10.2.6 -innodb.innodb_xtradb_compat : Added in 10.2.6 innodb.insert_debug : Modified in 10.2.6 innodb.log_file_name : Modified in 10.2.6 innodb.readahead : Added in 10.2.6 @@ -293,10 +292,6 @@ parts.partition_debug_innodb : MDEV-10891 - Can't create UNIX socket #---------------------------------------------------------------- -percona.* : MDEV-10997 - Not maintained - -#---------------------------------------------------------------- - perfschema.bad_option_3 : MDEV-12728 - Timeout on Power perfschema.hostcache_ipv4_addrinfo_again_allow : MDEV-12759 - Crash perfschema.hostcache_ipv6_addrinfo_again_allow : MDEV-12752 - Crash diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index 74c755aa669..7c484619434 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -1239,7 +1239,7 @@ } { - XtraDB uses gcc __thread variables + TokuDB uses gcc __thread variables Memcheck:Leak fun:memalign fun:* |