diff options
Diffstat (limited to 'mysql-test')
393 files changed, 1747 insertions, 17235 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test index f7a1e71d5d9..e9191d5fcd8 100644 --- a/mysql-test/extra/rpl_tests/rpl_deadlock.test +++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test @@ -46,6 +46,9 @@ BEGIN; SELECT * FROM t1 FOR UPDATE; # Save variable 'Slave_retried_transactions' before deadlock let $slave_retried_transactions= query_get_value(SHOW GLOBAL STATUS LIKE 'Slave_retried_transactions', Value, 1); +# Run the START SLAVE in a separate connection. Otherwise it terminates +# the SELECT FOR UPDATE transaction (START SLAVE does implicit COMMIT!). +connection slave1; START SLAVE; # Wait until SQL thread blocked: variable 'Slave_retried_transactions' will incremented let $status_var= Slave_retried_transactions; @@ -53,6 +56,7 @@ let $status_var_value= $slave_retried_transactions; let $status_type= GLOBAL; let $status_var_comparsion= >; --source include/wait_for_status_var.inc +connection slave; SELECT COUNT(*) FROM t2; COMMIT; sync_with_master; @@ -78,9 +82,11 @@ BEGIN; # Hold lock SELECT * FROM t1 FOR UPDATE; # Wait until slave stopped with error 'Lock wait timeout exceeded' +connection slave1; START SLAVE; let $slave_sql_errno= 1205; --source include/wait_for_slave_sql_error.inc +connection slave; SELECT COUNT(*) FROM t2; COMMIT; --source include/start_slave.inc @@ -109,9 +115,11 @@ BEGIN; # Hold lock SELECT * FROM t1 FOR UPDATE; # Wait until slave stopped with error 'Lock wait timeout exceeded' +connection slave1; START SLAVE; let $slave_sql_errno= 1205; --source include/wait_for_slave_sql_error.inc +connection slave; SELECT COUNT(*) FROM t2; COMMIT; --source include/start_slave.inc diff --git a/mysql-test/include/ctype_utf8mb4.inc b/mysql-test/include/ctype_utf8mb4.inc index 2d48f9373f6..cb422f66947 100644 --- a/mysql-test/include/ctype_utf8mb4.inc +++ b/mysql-test/include/ctype_utf8mb4.inc @@ -191,8 +191,10 @@ drop table t1; # if(!$is_heap) { ---error ER_TOO_LONG_KEY +--error 0,ER_TOO_LONG_KEY eval create table t1 (a text character set utf8mb4, primary key(a(371))) engine $engine; +show warnings; +drop table if exists t1; } # 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/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index d47e7d322b5..89f9f66ae1d 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -28,7 +28,7 @@ BEGIN -- Dump all global variables except those -- that are supposed to change SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE variable_name NOT IN ('timestamp', 'innodb_file_format_max') + WHERE variable_name NOT IN ('timestamp') AND variable_name not like "Last_IO_Err*" AND variable_name != 'INNODB_IBUF_MAX_SIZE' AND variable_name != 'INNODB_USE_NATIVE_AIO' diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c0b26f41b71..df9b0d835c2 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; @@ -5244,6 +5231,7 @@ sub server_need_restart { if (!My::Options::same($started_opts, $extra_opts) || exists $server->{'restart_opts'}) { + delete $server->{'restart_opts'}; my $use_dynamic_option_switch= 0; if (!$use_dynamic_option_switch) { @@ -5972,7 +5960,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/ctype_utf8mb4_innodb.result b/mysql-test/r/ctype_utf8mb4_innodb.result index 11d89154269..ca197c9a64b 100644 --- a/mysql-test/r/ctype_utf8mb4_innodb.result +++ b/mysql-test/r/ctype_utf8mb4_innodb.result @@ -244,7 +244,9 @@ hex(s1) 413F drop table t1; create table t1 (a text character set utf8mb4, primary key(a(371))) engine InnoDB; -ERROR 42000: Specified key was too long; max key length is 767 bytes +show warnings; +Level Code Message +drop table if exists t1; CREATE TABLE t1 ( a varchar(10) ) CHARACTER SET utf8mb4 ENGINE InnoDB; INSERT INTO t1 VALUES ( 'test' ); SELECT a.a, b.a FROM t1 a, t1 b WHERE a.a = b.a; @@ -1425,8 +1427,6 @@ CREATE TABLE t1 ( a varchar(255) NOT NULL default '', KEY a (a) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci; -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes insert into t1 values (_utf8mb4 0xe880bd); insert into t1 values (_utf8mb4 0x5b); select hex(a) from t1; @@ -1473,8 +1473,6 @@ DROP TABLE IF EXISTS t1; Warnings: Note 1051 Unknown table 'test.t1' CREATE TABLE t1(a VARCHAR(255), KEY(a)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes INSERT INTO t1 VALUES('uuABCDEFGHIGKLMNOPRSTUVWXYZ̈bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'); INSERT INTO t1 VALUES('uu'); check table t1; @@ -2346,8 +2344,6 @@ Tape TINYTEXT, PRIMARY KEY (clipid), KEY tape(Tape(255)) ) CHARACTER SET=utf8mb4 ENGINE InnoDB; -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes ALTER TABLE t1 ADD mos TINYINT DEFAULT 0 AFTER clipid; SHOW CREATE TABLE t1; Table Create Table @@ -2356,7 +2352,7 @@ t1 CREATE TABLE `t1` ( `mos` tinyint(4) DEFAULT 0, `Tape` tinytext DEFAULT NULL, PRIMARY KEY (`clipid`), - KEY `tape` (`Tape`(191)) + KEY `tape` (`Tape`(255)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DROP TABLE t1; # diff --git a/mysql-test/r/ctype_utf8mb4_myisam.result b/mysql-test/r/ctype_utf8mb4_myisam.result index ef7bda0a79b..a1be913602e 100644 --- a/mysql-test/r/ctype_utf8mb4_myisam.result +++ b/mysql-test/r/ctype_utf8mb4_myisam.result @@ -244,7 +244,12 @@ hex(s1) 413F drop table t1; create table t1 (a text character set utf8mb4, primary key(a(371))) engine MyISAM; -ERROR 42000: Specified key was too long; max key length is 1000 bytes +show warnings; +Level Code Message +Error 1071 Specified key was too long; max key length is 1000 bytes +drop table if exists t1; +Warnings: +Note 1051 Unknown table 'test.t1' CREATE TABLE t1 ( a varchar(10) ) CHARACTER SET utf8mb4 ENGINE MyISAM; INSERT INTO t1 VALUES ( 'test' ); SELECT a.a, b.a FROM t1 a, t1 b WHERE a.a = b.a; 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/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 2baf4f6c314..9f748953521 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -258,6 +258,13 @@ The following options may be given as the first argument: applied; this means it is the responsibility of the user to ensure that GTID sequence numbers are strictly increasing. + --gtid-pos-auto-engines=name + List of engines for which to automatically create a + mysql.gtid_slave_pos_ENGINE table, if a transaction using + that engine is replicated. This can be used to avoid + introducing cross-engine transactions, if engines are + used different from that used by table + mysql.gtid_slave_pos --gtid-strict-mode Enforce strict seq_no ordering of events in the binary log. Slave stops with an error if it encounters an event that would cause it to generate an out-of-order binlog if @@ -272,6 +279,15 @@ The following options may be given as the first argument: height-balanced. --host-cache-size=# How many host names should be cached to avoid resolving. (Automatically configured unless set explicitly) + --idle-readonly-transaction-timeout=# + The number of seconds the server waits for read-only idle + transaction + --idle-readwrite-transaction-timeout=# + The number of seconds the server waits for read-write + idle transaction + --idle-transaction-timeout=# + The number of seconds the server waits for idle + transaction --ignore-builtin-innodb Disable initialization of builtin InnoDB plugin --ignore-db-dirs=name @@ -929,11 +945,7 @@ The following options may be given as the first argument: --session-track-state-change Track changes to the session state. --session-track-system-variables=name - Track changes in registered system variables. For - compatibility with MySQL defaults this variable should be - set to "autocommit, character_set_client, - character_set_connection, character_set_results, - time_zone" + Track changes in registered system variables. --session-track-transaction-info=name Track changes to the transaction attributes. OFF to disable; STATE to track just transaction state (Is there @@ -1263,11 +1275,15 @@ getopt-prefix-matching FALSE group-concat-max-len 1048576 gtid-domain-id 0 gtid-ignore-duplicates FALSE +gtid-pos-auto-engines gtid-strict-mode FALSE help TRUE histogram-size 0 histogram-type SINGLE_PREC_HB host-cache-size 279 +idle-readonly-transaction-timeout 0 +idle-readwrite-transaction-timeout 0 +idle-transaction-timeout 0 ignore-builtin-innodb FALSE ignore-db-dirs init-connect @@ -1454,7 +1470,7 @@ secure-file-priv (No default value) server-id 1 session-track-schema TRUE session-track-state-change FALSE -session-track-system-variables +session-track-system-variables autocommit,character_set_client,character_set_connection,character_set_results,time_zone session-track-transaction-info OFF show-slave-auth-info FALSE silent-startup FALSE diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index c74f25928a9..09d8728601f 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -852,8 +852,6 @@ SUBPARTITION BY KEY(f6) SUBPARTITIONS 4 ( PARTITION p0 VALUES IN (1,3,9,null), PARTITION p1 VALUES IN (2,4,0) ); -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes INSERT INTO t2 VALUES ('k','s',3,'b','j'),('a','b',NULL,'v','j'),('c','m',9,'t',NULL), ('b','l',9,'b',NULL),('i','y',3,'o','w'),('c','m',NULL,'a','m'), diff --git a/mysql-test/r/timeout.result b/mysql-test/r/timeout.result new file mode 100644 index 00000000000..8d1ca137043 --- /dev/null +++ b/mysql-test/r/timeout.result @@ -0,0 +1,67 @@ +# +# MDEV-11379 - AliSQL: [Feature] Issue#8: SELECT FOR UPDATE WAIT +# MDEV-11388 - AliSQL: [Feature] Issue#15 DDL FAST FAIL +# +CREATE TABLE t1(a INT, b TEXT, c MULTIPOLYGON NOT NULL); +CREATE INDEX i1 ON t1(a) WAIT 1; +CREATE FULLTEXT INDEX i2 ON t1(b) WAIT 1; +CREATE SPATIAL INDEX i3 ON t1(c) WAIT 1; +ALTER TABLE t1 WAIT 1 COMMENT='test'; +OPTIMIZE TABLE t1 WAIT 1; +Table Op Msg_type Msg_text +test.t1 optimize status OK +DROP INDEX i1 ON t1 WAIT 1; +TRUNCATE TABLE t1 WAIT 1; +RENAME TABLE t1 WAIT 1 TO t2; +RENAME TABLE t2 NOWAIT TO t1; +connect con1, localhost, root,,; +LOCK TABLE t1 WRITE WAIT 31536001; +Warnings: +Warning 1292 Truncated incorrect lock_wait_timeout value: '31536001' +connection default; +CREATE INDEX i1 ON t1(a) WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +CREATE INDEX i1 ON t1(a) NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +CREATE FULLTEXT INDEX i2 ON t1(b) WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +CREATE FULLTEXT INDEX i2 ON t1(b) NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +CREATE SPATIAL INDEX i3 ON t1(c) WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +CREATE SPATIAL INDEX i3 ON t1(c) NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +ALTER TABLE t1 WAIT 0 COMMENT='test'; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +ALTER TABLE t1 NOWAIT COMMENT='test'; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +OPTIMIZE TABLE t1 WAIT 0; +Table Op Msg_type Msg_text +test.t1 optimize Error Lock wait timeout exceeded; try restarting transaction +test.t1 optimize status Operation failed +OPTIMIZE TABLE t1 NOWAIT; +Table Op Msg_type Msg_text +test.t1 optimize Error Lock wait timeout exceeded; try restarting transaction +test.t1 optimize status Operation failed +DROP INDEX i1 ON t1 WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +DROP INDEX i1 ON t1 NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +TRUNCATE TABLE t1 WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +TRUNCATE TABLE t1 NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +RENAME TABLE t1 WAIT 0 TO t2; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +RENAME TABLE t1 NOWAIT TO t2; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +DROP TABLE t1 WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +DROP TABLE t1 NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +LOCK TABLE t1 WRITE WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +LOCK TABLE t1 WRITE NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +disconnect con1; +DROP TABLE t1 WAIT 1; diff --git a/mysql-test/r/transaction_timeout.result b/mysql-test/r/transaction_timeout.result new file mode 100644 index 00000000000..c8db4a0e744 --- /dev/null +++ b/mysql-test/r/transaction_timeout.result @@ -0,0 +1,51 @@ +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +# Test idle_transaction_timeout +connect c0,localhost,root,,test,,; +SHOW VARIABLES LIKE 'idle_%transaction_timeout'; +Variable_name Value +idle_readonly_transaction_timeout 0 +idle_readwrite_transaction_timeout 0 +idle_transaction_timeout 0 +SET autocommit=0; +SET idle_transaction_timeout=1; +BEGIN; +SELECT * FROM t1; +a +SELECT * FROM t1; +Got one of the listed errors +disconnect c0; +# Test idle_readonly_transaction_timeout +connect c1,localhost,root,,test,,; +SHOW VARIABLES LIKE 'idle_%transaction_timeout'; +Variable_name Value +idle_readonly_transaction_timeout 0 +idle_readwrite_transaction_timeout 0 +idle_transaction_timeout 0 +SET autocommit=0; +SET idle_readonly_transaction_timeout=1; +BEGIN; +SELECT * FROM t1; +a +SELECT * FROM t1; +Got one of the listed errors +disconnect c1; +# Test idle_readwrite_transaction_timeout +connect c2,localhost,root,,test,,; +SHOW VARIABLES LIKE 'idle_%transaction_timeout'; +Variable_name Value +idle_readonly_transaction_timeout 0 +idle_readwrite_transaction_timeout 0 +idle_transaction_timeout 0 +SET autocommit=0; +SET idle_readwrite_transaction_timeout=1; +BEGIN; +SELECT * FROM t1; +a +SELECT * FROM t1; +a +INSERT INTO t1 VALUES (1); +SELECT * FROM t1; +Got one of the listed errors +disconnect c2; +connection default; +DROP TABLE t1; 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/binlog_encryption/rpl_sync-slave.opt b/mysql-test/suite/binlog_encryption/rpl_sync-slave.opt index 2e8be18dbd7..795330535c1 100644 --- a/mysql-test/suite/binlog_encryption/rpl_sync-slave.opt +++ b/mysql-test/suite/binlog_encryption/rpl_sync-slave.opt @@ -1,2 +1,2 @@ ---sync-relay-log-info=1 --relay-log-recovery=1 --loose-innodb_file_format_check=1 --default-storage-engine=MyISAM --loose-innodb-file-per-table=0 +--sync-relay-log-info=1 --relay-log-recovery=1 --default-storage-engine=MyISAM --loose-innodb-file-per-table=0 --skip-core-file --skip-slave-start diff --git a/mysql-test/suite/encryption/r/encrypt_and_grep.result b/mysql-test/suite/encryption/r/encrypt_and_grep.result index 38dc11e7850..05ebefd28b5 100644 --- a/mysql-test/suite/encryption/r/encrypt_and_grep.result +++ b/mysql-test/suite/encryption/r/encrypt_and_grep.result @@ -1,5 +1,4 @@ SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Barracuda`; create table t1 (a varchar(255)) engine=innodb encrypted=yes; create table t2 (a varchar(255)) engine=innodb; show warnings; diff --git a/mysql-test/suite/encryption/r/innodb-first-page-read.result b/mysql-test/suite/encryption/r/innodb-first-page-read.result index 9b57b9de5f9..a630aa3cb09 100644 --- a/mysql-test/suite/encryption/r/innodb-first-page-read.result +++ b/mysql-test/suite/encryption/r/innodb-first-page-read.result @@ -1,5 +1,3 @@ -SET GLOBAL innodb_file_format = `Barracuda`; -SET GLOBAL innodb_file_per_table = ON; create database innodb_test; use innodb_test; create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb; diff --git a/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result b/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result index a642ad20183..b39b3d13c97 100644 --- a/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result +++ b/mysql-test/suite/encryption/r/innodb-key-rotation-disable.result @@ -5,6 +5,8 @@ NAME mysql/innodb_table_stats mysql/innodb_index_stats innodb_system +SET GLOBAL innodb_file_per_table = ON; +set global innodb_compression_algorithm = 1; create database enctests; use enctests; create table t1(a int not null primary key, b char(200)) engine=innodb; diff --git a/mysql-test/suite/encryption/r/innodb-redo-badkey.result b/mysql-test/suite/encryption/r/innodb-redo-badkey.result index 9eba53622e8..e48825e27ad 100644 --- a/mysql-test/suite/encryption/r/innodb-redo-badkey.result +++ b/mysql-test/suite/encryption/r/innodb-redo-badkey.result @@ -5,7 +5,6 @@ call mtr.add_suppression("InnoDB: Plugin initialization aborted"); call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed"); # Restart mysqld --file-key-management-filename=keys2.txt # Wait max 10 min for key encryption threads to encrypt all spaces -SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; create table t1(a int not null primary key auto_increment, c char(250), b blob, index(b(10))) engine=innodb row_format=compressed encrypted=yes encryption_key_id=4; create table t2(a int not null primary key auto_increment, c char(250), b blob, index(b(10))) engine=innodb row_format=compressed; diff --git a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result index dcbe1f5a395..530d228cc85 100644 --- a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result +++ b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result @@ -4,12 +4,8 @@ call mtr.add_suppression("Plugin 'file_key_management' .*"); call mtr.add_suppression("InnoDB: cannot enable encryption, encryption plugin is not available"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error."); call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t2 cannot be decrypted."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t3 cannot be decrypted."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t4 cannot be decrypted."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t1 cannot be decrypted."); +call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file test/t[1-4] cannot be decrypted"); # Restart mysqld --file-key-management-filename=keys2.txt -SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; create table t1(a int not null primary key auto_increment, c char(200), b blob, index(b(10))) engine=innodb row_format=compressed encrypted=yes encryption_key_id=20; create table t2(a int not null primary key auto_increment, c char(200), b blob, index(b(10))) engine=innodb row_format=compressed; diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result index 4a31f1ba454..6eb92aedeb7 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result @@ -28,7 +28,7 @@ SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS -FOUND 1 /InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\. Please follow the instructions at http://dev.mysql.com/doc/refman/5.7/en/upgrading-downgrading.html/ in mysqld.1.err +FOUND 1 /InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\./ in mysqld.1.err # valid header, but old-format checkpoint blocks SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' @@ -40,6 +40,12 @@ SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS +FOUND 1 /InnoDB: Upgrade after a crash is not supported\. The redo log was created with malicious intentions, or perhaps, and it appears corrupted\./ in mysqld.1.err +# same, but with current-version header +SELECT * FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS FOUND 1 /InnoDB: Invalid log block checksum. block: 2372 checkpoint no: 1 expected: 3362026715 found: 144444122/ in mysqld.1.err FOUND 1 /InnoDB: Missing MLOG_CHECKPOINT between the checkpoint 1213964 and the end 1213952\./ in mysqld.1.err # --innodb-force-recovery=6 (skip the entire redo log) diff --git a/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result b/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result index 359f285901c..fd2f03a5d18 100644 --- a/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result +++ b/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result @@ -1,3 +1,4 @@ +SET GLOBAL innodb_file_per_table = ON; SET GLOBAL innodb_encryption_threads = 4; SET GLOBAL innodb_encrypt_tables = on; set global innodb_compression_algorithm = 1; diff --git a/mysql-test/suite/encryption/r/innodb_onlinealter_encryption.result b/mysql-test/suite/encryption/r/innodb_onlinealter_encryption.result index f75268f3290..779eb5917cd 100644 --- a/mysql-test/suite/encryption/r/innodb_onlinealter_encryption.result +++ b/mysql-test/suite/encryption/r/innodb_onlinealter_encryption.result @@ -40,7 +40,6 @@ NOT FOUND /author/ in t5.ibd NOT FOUND /mangled/ in t6.ibd # t7 ... on expecting NOT FOUND NOT FOUND /mysql/ in t7.ibd -SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; ALTER TABLE t1 ADD COLUMN b int default 2; ALTER TABLE t2 ADD COLUMN b int default 2; diff --git a/mysql-test/suite/encryption/t/encrypt_and_grep.test b/mysql-test/suite/encryption/t/encrypt_and_grep.test index c5a10620f6e..b0bf41a640d 100644 --- a/mysql-test/suite/encryption/t/encrypt_and_grep.test +++ b/mysql-test/suite/encryption/t/encrypt_and_grep.test @@ -14,10 +14,7 @@ --let t3_IBD = $MYSQLD_DATADIR/test/t3.ibd --let SEARCH_RANGE = 10000000 ---disable_warnings SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Barracuda`; ---enable_warnings create table t1 (a varchar(255)) engine=innodb encrypted=yes; create table t2 (a varchar(255)) engine=innodb; diff --git a/mysql-test/suite/encryption/t/innodb-first-page-read.test b/mysql-test/suite/encryption/t/innodb-first-page-read.test index 1fc07159e05..216a864f746 100644 --- a/mysql-test/suite/encryption/t/innodb-first-page-read.test +++ b/mysql-test/suite/encryption/t/innodb-first-page-read.test @@ -2,11 +2,6 @@ -- source include/have_file_key_management_plugin.inc -- source include/not_embedded.inc ---disable_warnings -SET GLOBAL innodb_file_format = `Barracuda`; -SET GLOBAL innodb_file_per_table = ON; ---enable_warnings - create database innodb_test; use innodb_test; create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb; diff --git a/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test b/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test index 574e0c3becc..3167cee4b4b 100644 --- a/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test +++ b/mysql-test/suite/encryption/t/innodb-key-rotation-disable.test @@ -6,15 +6,10 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0; ---disable_query_log ---disable_warnings let $encryption = `SELECT @@innodb_encrypt_tables`; -SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; # zlib set global innodb_compression_algorithm = 1; ---enable_warnings ---enable_query_log create database enctests; use enctests; diff --git a/mysql-test/suite/encryption/t/innodb-redo-badkey.test b/mysql-test/suite/encryption/t/innodb-redo-badkey.test index 15cccf29fe1..6a197ecdfff 100644 --- a/mysql-test/suite/encryption/t/innodb-redo-badkey.test +++ b/mysql-test/suite/encryption/t/innodb-redo-badkey.test @@ -18,10 +18,7 @@ call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE faile --let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 --source include/wait_condition.inc ---disable_warnings -SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; ---enable_warnings create table t1(a int not null primary key auto_increment, c char(250), b blob, index(b(10))) engine=innodb row_format=compressed encrypted=yes encryption_key_id=4; create table t2(a int not null primary key auto_increment, c char(250), b blob, index(b(10))) engine=innodb row_format=compressed; diff --git a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test index e55e2ade153..5c344f5beb1 100644 --- a/mysql-test/suite/encryption/t/innodb-redo-nokeys.test +++ b/mysql-test/suite/encryption/t/innodb-redo-nokeys.test @@ -9,19 +9,13 @@ call mtr.add_suppression("Plugin 'file_key_management' .*"); call mtr.add_suppression("InnoDB: cannot enable encryption, encryption plugin is not available"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error."); call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t2 cannot be decrypted."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t3 cannot be decrypted."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t4 cannot be decrypted."); -call mtr.add_suppression("InnoDB: The page \[page id: space=[0-9]+, page number=[0-9]+\] in file test/t1 cannot be decrypted."); +call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file test/t[1-4] cannot be decrypted"); --echo # Restart mysqld --file-key-management-filename=keys2.txt -- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt -- source include/restart_mysqld.inc ---disable_warnings -SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; ---enable_warnings create table t1(a int not null primary key auto_increment, c char(200), b blob, index(b(10))) engine=innodb row_format=compressed encrypted=yes encryption_key_id=20; create table t2(a int not null primary key auto_increment, c char(200), b blob, index(b(10))) engine=innodb row_format=compressed; diff --git a/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test b/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test index 113b5001f0f..999ff4ff45a 100644 --- a/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test +++ b/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test @@ -5,6 +5,7 @@ let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; let $innodb_encrypt_tables_orig = `SELECT @@innodb_encrypt_tables`; let $innodb_encryption_threads_orig = `SELECT @@innodb_encryption_threads`; +SET GLOBAL innodb_file_per_table = ON; SET GLOBAL innodb_encryption_threads = 4; SET GLOBAL innodb_encrypt_tables = on; diff --git a/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test b/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test index b222e1882d5..9f61bf118aa 100644 --- a/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test +++ b/mysql-test/suite/encryption/t/innodb_onlinealter_encryption.test @@ -75,10 +75,7 @@ set autocommit=1; -- source include/start_mysqld.inc ---disable_warnings -SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_per_table = ON; ---enable_warnings ALTER TABLE t1 ADD COLUMN b int default 2; ALTER TABLE t2 ADD COLUMN b int default 2; diff --git a/mysql-test/suite/innodb/include/innodb-page-compression.inc b/mysql-test/suite/innodb/include/innodb-page-compression.inc index 3acbeaf0988..0e7ae8cf029 100644 --- a/mysql-test/suite/innodb/include/innodb-page-compression.inc +++ b/mysql-test/suite/innodb/include/innodb-page-compression.inc @@ -1,8 +1,3 @@ ---disable_warnings -set global innodb_file_format = `Barracuda`; -set global innodb_file_per_table = on; ---enable_warnings - create table innodb_normal (c1 int not null auto_increment primary key, b char(200)) engine=innodb; create table innodb_page_compressed1 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=1; create table innodb_page_compressed2 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=2; 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/group_commit_crash.result b/mysql-test/suite/innodb/r/group_commit_crash.result index f07df897453..005049df281 100644 --- a/mysql-test/suite/innodb/r/group_commit_crash.result +++ b/mysql-test/suite/innodb/r/group_commit_crash.result @@ -123,5 +123,3 @@ delete from t1; DROP TABLE t1; DROP TABLE t2; DROP PROCEDURE setcrash; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html diff --git a/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result b/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result index 2cd9f01d7ed..846500ad2b1 100644 --- a/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result +++ b/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result @@ -123,5 +123,3 @@ delete from t1; DROP TABLE t1; DROP TABLE t2; DROP PROCEDURE setcrash; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html diff --git a/mysql-test/suite/innodb/r/innodb-16k.result b/mysql-test/suite/innodb/r/innodb-16k.result index 206abe45887..7435089cec3 100644 --- a/mysql-test/suite/innodb/r/innodb-16k.result +++ b/mysql-test/suite/innodb/r/innodb-16k.result @@ -1,7 +1,4 @@ call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); -SET GLOBAL innodb_large_prefix = OFF; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html # Test 1) Show the page size from Information Schema SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; @@ -968,5 +965,3 @@ COL196 TEXT, COL197 TEXT) row_format=compact,ENGINE=INNODB; ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline. -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html diff --git a/mysql-test/suite/innodb/r/innodb-alter-nullable.result b/mysql-test/suite/innodb/r/innodb-alter-nullable.result index 7048f49f4a2..f2c0643f0f1 100644 --- a/mysql-test/suite/innodb/r/innodb-alter-nullable.result +++ b/mysql-test/suite/innodb/r/innodb-alter-nullable.result @@ -54,6 +54,6 @@ connection default; ALTER TABLE t MODIFY c2 INT NULL, ALGORITHM=INPLACE; SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME='test/t'; -TABLE_ID NAME FLAG N_COLS SPACE FILE_FORMAT ROW_FORMAT ZIP_PAGE_SIZE SPACE_TYPE -# test/t 33 6 # Barracuda Dynamic 0 Single +TABLE_ID NAME FLAG N_COLS SPACE ROW_FORMAT ZIP_PAGE_SIZE SPACE_TYPE +# test/t 33 6 # Dynamic 0 Single DROP TABLE t; 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/r/innodb-page_compression_default.result b/mysql-test/suite/innodb/r/innodb-page_compression_default.result index 413450e1a6d..39a14072571 100644 --- a/mysql-test/suite/innodb/r/innodb-page_compression_default.result +++ b/mysql-test/suite/innodb/r/innodb-page_compression_default.result @@ -1,6 +1,4 @@ call mtr.add_suppression("InnoDB: Compression failed for space [0-9]+ name test/innodb_page_compressed[0-9] len [0-9]+ err 2 write_size [0-9]+."); -set global innodb_file_format = `Barracuda`; -set global innodb_file_per_table = on; create table innodb_normal (c1 int not null auto_increment primary key, b char(200)) engine=innodb; create table innodb_page_compressed1 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=1; create table innodb_page_compressed2 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=2; diff --git a/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result b/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result index 83a17f678e4..e99e55ed9a8 100644 --- a/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result +++ b/mysql-test/suite/innodb/r/innodb-page_compression_snappy.result @@ -1,7 +1,5 @@ call mtr.add_suppression("InnoDB: Compression failed for space [0-9]+ name test/innodb_page_compressed[0-9] len [0-9]+ err 2 write_size [0-9]+."); set global innodb_compression_algorithm = snappy; -set global innodb_file_format = `Barracuda`; -set global innodb_file_per_table = on; create table innodb_normal (c1 int not null auto_increment primary key, b char(200)) engine=innodb; create table innodb_page_compressed1 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=1; create table innodb_page_compressed2 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=2; diff --git a/mysql-test/suite/innodb/r/innodb-timeout.result b/mysql-test/suite/innodb/r/innodb-timeout.result index f252ebac314..52ed1a6f9b4 100644 --- a/mysql-test/suite/innodb/r/innodb-timeout.result +++ b/mysql-test/suite/innodb/r/innodb-timeout.result @@ -57,3 +57,63 @@ disconnect a; connection default; drop table t1; set global innodb_lock_wait_timeout=<initial_timeout>; +# +# MDEV-11379 - AliSQL: [Feature] Issue#8: SELECT FOR UPDATE WAIT +# +CREATE TABLE t1 (c1 INT, c2 INT) ENGINE=InnoDB; +INSERT INTO t1 (c1,c2) values (1,1),(2,2),(3,3),(4,4); +CREATE VIEW v1 AS SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +ERROR HY000: View's SELECT contains a '[NO]WAIT' clause +CREATE VIEW v1 AS SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; +ERROR HY000: View's SELECT contains a '[NO]WAIT' clause +CREATE PROCEDURE p1() SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +ERROR 0A000: [NO]WAIT is not allowed in stored procedures +CREATE PROCEDURE p1() SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; +ERROR 0A000: [NO]WAIT is not allowed in stored procedures +connect con1,localhost,root,,; +LOCK TABLE t1 WRITE; +connect con2,localhost,root,,; +SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT'; +EXECUTE stmt; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +DEALLOCATE PREPARE stmt; +PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0'; +EXECUTE stmt; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +DEALLOCATE PREPARE stmt; +connection con1; +INSERT INTO t1 VALUES(5,5); +UNLOCK TABLES; +set AUTOCOMMIT=0; +SELECT * FROM t1 WHERE c1=4 FOR UPDATE; +connection con2; +set AUTOCOMMIT=0; +SET INNODB_LOCK_WAIT_TIMEOUT=1; +SELECT * FROM t1 WHERE c1=4 FOR UPDATE; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +connection con1; +UPDATE t1 SET c2=5 WHERE c1=4; +COMMIT; +set AUTOCOMMIT=0; +SELECT * FROM t1 WHERE c1=4 FOR UPDATE; +c1 c2 +4 5 +connection con2; +set AUTOCOMMIT=0; +SET INNODB_LOCK_WAIT_TIMEOUT=1; +SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 10; +connection con1; +COMMIT; +connection con2; +disconnect con1; +disconnect con2; +connection default; +DROP TABLE t1; diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index 8e0e6d5b512..edac0d0ab69 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -2358,15 +2358,9 @@ a b 20 NULL drop table t1; SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; -SET GLOBAL innodb_large_prefix=OFF; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create table t1 (v varchar(65530), key(v)); Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes -SET GLOBAL innodb_large_prefix=default; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html +Warning 1071 Specified key was too long; max key length is 3072 bytes drop table t1; create table t1 (v varchar(65536)); Warnings: @@ -2531,55 +2525,6 @@ t9 CREATE TABLE `t9` ( KEY `col1` (`col1`,`col2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t1, t2, t3, t4, t5, t6, t7, t8, t9; -SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; -SET GLOBAL innodb_large_prefix=OFF; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create table t1 (col1 varchar(768), index(col1)) -character set = latin1 engine = innodb; -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes -create table t2 (col1 varbinary(768), index(col1)) -character set = latin1 engine = innodb; -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes -create table t3 (col1 text, index(col1(768))) -character set = latin1 engine = innodb; -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes -create table t4 (col1 blob, index(col1(768))) -character set = latin1 engine = innodb; -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes -SET GLOBAL innodb_large_prefix=default; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `col1` varchar(768) DEFAULT NULL, - KEY `col1` (`col1`(767)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 -drop table t1, t2, t3, t4; -set global innodb_large_prefix=OFF; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create table t1 (col1 varchar(768) primary key) -character set = latin1 engine = innodb; -ERROR 42000: Specified key was too long; max key length is 767 bytes -create table t2 (col1 varbinary(768) primary key) -character set = latin1 engine = innodb; -ERROR 42000: Specified key was too long; max key length is 767 bytes -create table t3 (col1 text, primary key(col1(768))) -character set = latin1 engine = innodb; -ERROR 42000: Specified key was too long; max key length is 767 bytes -create table t4 (col1 blob, primary key(col1(768))) -character set = latin1 engine = innodb; -ERROR 42000: Specified key was too long; max key length is 767 bytes -SET sql_mode = default; -set global innodb_large_prefix=default; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html CREATE TABLE t1 ( id INT PRIMARY KEY diff --git a/mysql-test/suite/innodb/r/innodb_bug47167.result b/mysql-test/suite/innodb/r/innodb_bug47167.result deleted file mode 100644 index b678046e308..00000000000 --- a/mysql-test/suite/innodb/r/innodb_bug47167.result +++ /dev/null @@ -1,32 +0,0 @@ -set @old_innodb_file_format_max=@@innodb_file_format_max; -select @old_innodb_file_format_max; -@old_innodb_file_format_max -Barracuda -set global innodb_file_format_max = Barracuda; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format_max; -@@innodb_file_format_max -Barracuda -set global innodb_file_format_max = DEFAULT; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format_max; -@@innodb_file_format_max -Antelope -set global innodb_file_format_max = @old_innodb_file_format_max; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format_max; -@@innodb_file_format_max -Barracuda -set global innodb_file_format_max = cheetah; -ERROR 42000: Variable 'innodb_file_format_max' can't be set to the value of 'cheetah' -set global innodb_file_format_max = Bear; -ERROR 42000: Variable 'innodb_file_format_max' can't be set to the value of 'Bear' -set global innodb_file_format_max = on; -ERROR 42000: Variable 'innodb_file_format_max' can't be set to the value of 'ON' -set global innodb_file_format_max = off; -ERROR 42000: Variable 'innodb_file_format_max' can't be set to the value of 'off' -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html diff --git a/mysql-test/suite/innodb/r/innodb_file_format.result b/mysql-test/suite/innodb/r/innodb_file_format.result deleted file mode 100644 index e489911afb5..00000000000 --- a/mysql-test/suite/innodb/r/innodb_file_format.result +++ /dev/null @@ -1,66 +0,0 @@ -select @@innodb_file_format; -@@innodb_file_format -Barracuda -select @@innodb_file_format_check; -@@innodb_file_format_check -1 -select @@innodb_file_format_max; -@@innodb_file_format_max -Barracuda -set global innodb_file_format=antelope; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format=barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format=cheetah; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'cheetah' -select @@innodb_file_format; -@@innodb_file_format -Barracuda -set global innodb_file_format=default; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format; -@@innodb_file_format -Barracuda -set global innodb_file_format=on; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON' -set global innodb_file_format=off; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off' -select @@innodb_file_format; -@@innodb_file_format -Barracuda -set global innodb_file_format_max=antelope; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format_max=barracuda; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format_max=cheetah; -ERROR 42000: Variable 'innodb_file_format_max' can't be set to the value of 'cheetah' -select @@innodb_file_format_max; -@@innodb_file_format_max -Barracuda -set global innodb_file_format_max=default; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format_max; -@@innodb_file_format_max -Antelope -set global innodb_file_format=on; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'ON' -set global innodb_file_format=off; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'off' -select @@innodb_file_format_max; -@@innodb_file_format_max -Antelope -set global innodb_file_format_max=antelope; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format_check=off; -ERROR HY000: Variable 'innodb_file_format_check' is a read only variable -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html diff --git a/mysql-test/suite/innodb/r/innodb_information_schema.result b/mysql-test/suite/innodb/r/innodb_information_schema.result index 36c76b03bd0..c1625f2bc3c 100644 --- a/mysql-test/suite/innodb/r/innodb_information_schema.result +++ b/mysql-test/suite/innodb/r/innodb_information_schema.result @@ -42,7 +42,6 @@ trx_isolation_level varchar(16) NO trx_unique_checks int(1) NO 0 trx_foreign_key_checks int(1) NO 0 trx_last_foreign_key_error varchar(256) YES NULL -trx_adaptive_hash_latched int(1) NO 0 trx_is_read_only int(1) NO 0 trx_autocommit_non_locking int(1) NO 0 trx_state trx_weight trx_tables_in_use trx_tables_locked trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 4c815c7c212..cdfdbad9e20 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -1165,8 +1165,6 @@ a b drop table t1,t2; create table t1(f1 varchar(800) binary not null, key(f1)) character set utf8 collate utf8_general_ci; -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes insert into t1 values('aaa'); drop table t1; CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB; @@ -1546,13 +1544,11 @@ create table t1(a text) engine=innodb default charset=utf8; insert into t1 values('aaa'); set statement sql_mode = 'NO_ENGINE_SUBSTITUTION' for alter table t1 add index(a(1024)); -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` text DEFAULT NULL, - KEY `a` (`a`(255)) + KEY `a` (`a`(1024)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 drop table t1; CREATE TABLE t1 ( diff --git a/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result b/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result index a3ac78aadce..620157d67b1 100644 --- a/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result +++ b/mysql-test/suite/innodb/r/innodb_prefix_index_restart_server.result @@ -1,6 +1,3 @@ -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html CREATE TABLE worklog5743 ( col_1_text TEXT(4000) , col_2_text TEXT(4000) , PRIMARY KEY (col_1_text(3072)) @@ -87,6 +84,3 @@ worklog5743; col_1_text = REPEAT("a", 3500) col_2_text = REPEAT("o", 3500) 1 1 DROP TABLE worklog5743; -SET GLOBAL innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html diff --git a/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result b/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result index 4cde68b5505..103937fa408 100644 --- a/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result +++ b/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result @@ -1,5 +1,5 @@ select * from information_schema.innodb_trx; -trx_id trx_state trx_started trx_requested_lock_id trx_wait_started trx_weight trx_mysql_thread_id trx_query trx_operation_state trx_tables_in_use trx_tables_locked trx_lock_structs trx_lock_memory_bytes trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks trx_last_foreign_key_error trx_adaptive_hash_latched trx_is_read_only trx_autocommit_non_locking +trx_id trx_state trx_started trx_requested_lock_id trx_wait_started trx_weight trx_mysql_thread_id trx_query trx_operation_state trx_tables_in_use trx_tables_locked trx_lock_structs trx_lock_memory_bytes trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks trx_last_foreign_key_error trx_is_read_only trx_autocommit_non_locking Warnings: Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_trx but the InnoDB storage engine is not installed select * from information_schema.innodb_locks; @@ -346,7 +346,7 @@ Warnings: Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_buffer_page_lru but the InnoDB storage engine is not installed select * from information_schema.innodb_buffer_stats; select * from information_schema.innodb_sys_tables; -TABLE_ID NAME FLAG N_COLS SPACE FILE_FORMAT ROW_FORMAT ZIP_PAGE_SIZE SPACE_TYPE +TABLE_ID NAME FLAG N_COLS SPACE ROW_FORMAT ZIP_PAGE_SIZE SPACE_TYPE Warnings: Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_sys_tables but the InnoDB storage engine is not installed select * from information_schema.innodb_sys_tablestats; @@ -374,7 +374,7 @@ ID FOR_COL_NAME REF_COL_NAME POS Warnings: Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_sys_foreign_cols but the InnoDB storage engine is not installed select * from information_schema.innodb_sys_tablespaces; -SPACE NAME FLAG FILE_FORMAT ROW_FORMAT PAGE_SIZE ZIP_PAGE_SIZE SPACE_TYPE FS_BLOCK_SIZE FILE_SIZE ALLOCATED_SIZE +SPACE NAME FLAG ROW_FORMAT PAGE_SIZE ZIP_PAGE_SIZE SPACE_TYPE FS_BLOCK_SIZE FILE_SIZE ALLOCATED_SIZE Warnings: Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_sys_tablespaces but the InnoDB storage engine is not installed select * from information_schema.innodb_sys_datafiles; diff --git a/mysql-test/suite/innodb/r/innodb_xtradb_compat.result b/mysql-test/suite/innodb/r/innodb_xtradb_compat.result deleted file mode 100644 index 20b6ac4c892..00000000000 --- a/mysql-test/suite/innodb/r/innodb_xtradb_compat.result +++ /dev/null @@ -1,313 +0,0 @@ -select @@innodb_adaptive_hash_index_partitions, @@innodb_adaptive_hash_index_parts; -@@innodb_adaptive_hash_index_partitions @@innodb_adaptive_hash_index_parts -16 16 -set global innodb_adaptive_hash_index_partitions=1; -ERROR HY000: Variable 'innodb_adaptive_hash_index_partitions' is a read only variable -select @@innodb_buffer_pool_populate; -@@innodb_buffer_pool_populate -1 -set global innodb_buffer_pool_populate=1; -ERROR HY000: Variable 'innodb_buffer_pool_populate' is a read only variable -select @@innodb_cleaner_eviction_factor; -@@innodb_cleaner_eviction_factor -1 -set global innodb_cleaner_eviction_factor=1; -Warnings: -Warning 1287 Using innodb_cleaner_eviction_factor is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_cleaner_eviction_factor; -@@innodb_cleaner_eviction_factor -1 -select @@innodb_cleaner_flush_chunk_size; -@@innodb_cleaner_flush_chunk_size -16 -set global innodb_cleaner_flush_chunk_size=8; -Warnings: -Warning 1287 Using innodb_cleaner_flush_chunk_size is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_cleaner_flush_chunk_size; -@@innodb_cleaner_flush_chunk_size -16 -select @@innodb_cleaner_free_list_lwm; -@@innodb_cleaner_free_list_lwm -1 -set global innodb_cleaner_free_list_lwm=1; -Warnings: -Warning 1287 Using innodb_cleaner_free_list_lwm is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_cleaner_free_list_lwm; -@@innodb_cleaner_free_list_lwm -1 -select @@innodb_cleaner_lru_chunk_size; -@@innodb_cleaner_lru_chunk_size -1 -set global innodb_cleaner_lru_chunk_size=8; -Warnings: -Warning 1287 Using innodb_cleaner_lru_chunk_size is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_cleaner_lru_chunk_size; -@@innodb_cleaner_lru_chunk_size -1 -select @@innodb_cleaner_lsn_age_factor; -@@innodb_cleaner_lsn_age_factor -HIGH_CHECKPOINT -set global innodb_cleaner_lsn_age_factor=HIGH_CHECKPOINT; -Warnings: -Warning 1287 Using innodb_cleaner_lsn_age_factor is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_cleaner_lsn_age_factor; -@@innodb_cleaner_lsn_age_factor -HIGH_CHECKPOINT -select @@innodb_cleaner_max_flush_time; -@@innodb_cleaner_max_flush_time -1 -set global innodb_cleaner_max_flush_time=1; -Warnings: -Warning 1287 Using innodb_cleaner_max_flush_time is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_cleaner_max_flush_time; -@@innodb_cleaner_max_flush_time -1 -select @@innodb_cleaner_max_lru_time; -@@innodb_cleaner_max_lru_time -1 -set global innodb_cleaner_max_lru_time=1; -Warnings: -Warning 1287 Using innodb_cleaner_max_lru_time is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_cleaner_max_lru_time; -@@innodb_cleaner_max_lru_time -1 -select @@innodb_corrupt_table_action; -@@innodb_corrupt_table_action -salvage -set global innodb_corrupt_table_action=salvage; -Warnings: -Warning 1287 Using innodb_corrupt_table_action is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_corrupt_table_action; -@@innodb_corrupt_table_action -salvage -select @@innodb_empty_free_list_algorithm; -@@innodb_empty_free_list_algorithm -BACKOFF -set global innodb_empty_free_list_algorithm=BACKOFF; -Warnings: -Warning 1287 Using innodb_empty_free_list_algorithm is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_empty_free_list_algorithm; -@@innodb_empty_free_list_algorithm -BACKOFF -select @@innodb_fake_changes; -@@innodb_fake_changes -1 -set global innodb_fake_changes=1; -Warnings: -Warning 1287 Using innodb_fake_changes is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_fake_changes; -@@innodb_fake_changes -1 -# @@innodb_file_io_threads is absent -select @@innodb_foreground_preflush; -@@innodb_foreground_preflush -EXPONENTIAL_BACKOFF -set global innodb_foreground_preflush=EXPONENTIAL_BACKOFF; -Warnings: -Warning 1287 Using innodb_foreground_preflush is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_foreground_preflush; -@@innodb_foreground_preflush -EXPONENTIAL_BACKOFF -select @@innodb_kill_idle_transaction; -@@innodb_kill_idle_transaction -1 -set global innodb_kill_idle_transaction=1; -Warnings: -Warning 1287 Using innodb_kill_idle_transaction is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_kill_idle_transaction; -@@innodb_kill_idle_transaction -1 -select @@innodb_locking_fake_changes; -@@innodb_locking_fake_changes -1 -set global innodb_locking_fake_changes=1; -Warnings: -Warning 1287 Using innodb_locking_fake_changes is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_locking_fake_changes; -@@innodb_locking_fake_changes -1 -select @@innodb_log_arch_expire_sec; -@@innodb_log_arch_expire_sec -1 -set global innodb_log_arch_expire_sec=1; -Warnings: -Warning 1287 Using innodb_log_arch_expire_sec is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_log_arch_expire_sec; -@@innodb_log_arch_expire_sec -1 -select @@innodb_log_block_size; -@@innodb_log_block_size -16 -set global innodb_log_block_size= 8; -ERROR HY000: Variable 'innodb_log_block_size' is a read only variable -select @@innodb_log_checksum_algorithm, @@innodb_log_checksums; -@@innodb_log_checksum_algorithm @@innodb_log_checksums -STRICT_INNODB 1 -set global innodb_log_checksum_algorithm=NONE; -Warnings: -Warning 1287 Using innodb_log_checksum_algorithm is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_log_checksum_algorithm, @@innodb_log_checksums; -@@innodb_log_checksum_algorithm @@innodb_log_checksums -NONE 0 -set global innodb_log_checksum_algorithm=STRICT_INNODB; -Warnings: -Warning 1287 Using innodb_log_checksum_algorithm is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_log_checksum_algorithm, @@innodb_log_checksums; -@@innodb_log_checksum_algorithm @@innodb_log_checksums -STRICT_INNODB 1 -select @@innodb_max_bitmap_file_size; -@@innodb_max_bitmap_file_size -1 -set global innodb_max_bitmap_file_size=1; -Warnings: -Warning 1287 Using innodb_max_bitmap_file_size is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_max_bitmap_file_size; -@@innodb_max_bitmap_file_size -1 -select @@innodb_max_changed_pages; -@@innodb_max_changed_pages -1 -set global innodb_max_changed_pages=1; -Warnings: -Warning 1287 Using innodb_max_changed_pages is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_max_changed_pages; -@@innodb_max_changed_pages -1 -select @@innodb_mirrored_log_groups; -@@innodb_mirrored_log_groups -8 -set global innodb_mirrored_log_groups= 4; -ERROR HY000: Variable 'innodb_mirrored_log_groups' is a read only variable -select @@innodb_priority_cleaner; -@@innodb_priority_cleaner -1 -set global innodb_priority_cleaner=1; -Warnings: -Warning 1287 Using innodb_priority_cleaner is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_priority_cleaner; -@@innodb_priority_cleaner -1 -select @@innodb_priority_io; -@@innodb_priority_io -1 -set global innodb_priority_io=1; -Warnings: -Warning 1287 Using innodb_priority_io is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_priority_io; -@@innodb_priority_io -1 -select @@innodb_priority_master; -@@innodb_priority_master -1 -set global innodb_priority_master=1; -Warnings: -Warning 1287 Using innodb_priority_master is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_priority_master; -@@innodb_priority_master -1 -select @@innodb_priority_purge; -@@innodb_priority_purge -1 -set global innodb_priority_purge=1; -Warnings: -Warning 1287 Using innodb_priority_purge is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_priority_purge; -@@innodb_priority_purge -1 -select @@innodb_sched_priority_cleaner; -@@innodb_sched_priority_cleaner -16 -set global innodb_sched_priority_cleaner=8; -Warnings: -Warning 1287 Using innodb_sched_priority_cleaner is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_sched_priority_cleaner; -@@innodb_sched_priority_cleaner -16 -select @@innodb_sched_priority_io; -@@innodb_sched_priority_io -16 -set global innodb_sched_priority_io=8; -Warnings: -Warning 1287 Using innodb_sched_priority_io is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_sched_priority_io; -@@innodb_sched_priority_io -16 -select @@innodb_sched_priority_master; -@@innodb_sched_priority_master -16 -set global innodb_sched_priority_master=8; -Warnings: -Warning 1287 Using innodb_sched_priority_master is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_sched_priority_master; -@@innodb_sched_priority_master -16 -select @@innodb_sched_priority_purge; -@@innodb_sched_priority_purge -16 -set global innodb_sched_priority_purge=8; -Warnings: -Warning 1287 Using innodb_sched_priority_purge is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_sched_priority_purge; -@@innodb_sched_priority_purge -16 -select @@innodb_show_locks_held; -@@innodb_show_locks_held -16 -set global innodb_show_locks_held=8; -Warnings: -Warning 1287 Using innodb_show_locks_held is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_show_locks_held; -@@innodb_show_locks_held -16 -select @@innodb_show_verbose_locks; -@@innodb_show_verbose_locks -1 -set global innodb_show_verbose_locks=1; -Warnings: -Warning 1287 Using innodb_show_verbose_locks is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_show_verbose_locks; -@@innodb_show_verbose_locks -1 -select @@innodb_track_changed_pages; -@@innodb_track_changed_pages -1 -set global innodb_track_changed_pages=1; -ERROR HY000: Variable 'innodb_track_changed_pages' is a read only variable -select @@innodb_track_redo_log_now; -@@innodb_track_redo_log_now -1 -set global innodb_track_redo_log_now=1; -Warnings: -Warning 1287 Using innodb_track_redo_log_now is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_track_redo_log_now; -@@innodb_track_redo_log_now -1 -select @@innodb_use_global_flush_log_at_trx_commit; -@@innodb_use_global_flush_log_at_trx_commit -1 -set global innodb_use_global_flush_log_at_trx_commit=1; -Warnings: -Warning 1287 Using innodb_use_global_flush_log_at_trx_commit is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_use_global_flush_log_at_trx_commit; -@@innodb_use_global_flush_log_at_trx_commit -1 -select @@innodb_use_stacktrace; -@@innodb_use_stacktrace -1 -set global innodb_use_stacktrace=1; -ERROR HY000: Variable 'innodb_use_stacktrace' is a read only variable -select @@innodb_log_archive; -@@innodb_log_archive -1 -set global innodb_log_archive=1; -Warnings: -Warning 1287 Using innodb_log_archive is deprecated and the parameter may be removed in future releases. Ignoning the parameter. -select @@innodb_log_archive; -@@innodb_log_archive -1 -select @@innodb_log_arch_dir; -@@innodb_log_arch_dir -ttt -set global innodb_log_arch_dir="ttt"; -ERROR HY000: Variable 'innodb_log_arch_dir' is a read only variable -FOUND 36 /Using [A-Za-z\-]* is deprecated and the parameter may be removed in future releases. Ignoning the parameter./ in mysqld.1.err diff --git a/mysql-test/suite/innodb/r/log_corruption.result b/mysql-test/suite/innodb/r/log_corruption.result index 3a20a11cd8f..35b7b00ead6 100644 --- a/mysql-test/suite/innodb/r/log_corruption.result +++ b/mysql-test/suite/innodb/r/log_corruption.result @@ -28,7 +28,7 @@ SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS -FOUND 1 /InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\. Please follow the instructions at http://dev.mysql.com/doc/refman/5.7/en/upgrading-downgrading.html/ in mysqld.1.err +FOUND 1 /InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\./ in mysqld.1.err # valid header, but old-format checkpoint blocks SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' @@ -40,6 +40,12 @@ SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS +FOUND 1 /InnoDB: Upgrade after a crash is not supported\. The redo log was created with malicious intentions, or perhaps, and it appears corrupted\./ in mysqld.1.err +# same, but with current-version header +SELECT * FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS FOUND 1 /InnoDB: Invalid log block checksum. block: 2372 checkpoint no: 1 expected: 3362026715 found: 144444122/ in mysqld.1.err FOUND 1 /InnoDB: Missing MLOG_CHECKPOINT between the checkpoint 1213964 and the end 1213952\./ in mysqld.1.err # --innodb-force-recovery=6 (skip the entire redo log) 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/group_commit_crash.test b/mysql-test/suite/innodb/t/group_commit_crash.test index 7ad0d9d1e74..12f7ba202e3 100644 --- a/mysql-test/suite/innodb/t/group_commit_crash.test +++ b/mysql-test/suite/innodb/t/group_commit_crash.test @@ -9,7 +9,6 @@ --source include/have_debug.inc --source include/have_log_bin.inc -let $file_format_max=`SELECT @@innodb_file_format_max`; CREATE TABLE t1(a CHAR(255), b CHAR(255), c CHAR(255), @@ -77,6 +76,3 @@ while ($numtests) DROP TABLE t1; DROP TABLE t2; DROP PROCEDURE setcrash; ---disable_query_log -eval SET GLOBAL innodb_file_format_max=$file_format_max; ---enable_query_log diff --git a/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test b/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test index 9dc2557e687..6115e3f0050 100644 --- a/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test +++ b/mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test @@ -9,7 +9,6 @@ --source include/have_debug.inc --source include/have_log_bin.inc -let $file_format_max=`SELECT @@innodb_file_format_max`; CREATE TABLE t1(a CHAR(255), b CHAR(255), c CHAR(255), @@ -77,6 +76,3 @@ while ($numtests) DROP TABLE t1; DROP TABLE t2; DROP PROCEDURE setcrash; ---disable_query_log -eval SET GLOBAL innodb_file_format_max=$file_format_max; ---enable_query_log diff --git a/mysql-test/suite/innodb/t/innodb-16k.test b/mysql-test/suite/innodb/t/innodb-16k.test index a771fac27ed..099edec4ec6 100644 --- a/mysql-test/suite/innodb/t/innodb-16k.test +++ b/mysql-test/suite/innodb/t/innodb-16k.test @@ -5,13 +5,7 @@ call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); ---disable_query_log let $MYSQLD_DATADIR= `select @@datadir`; -# These values can change during the test -let $innodb_large_prefix_orig = `SELECT @@innodb_large_prefix`; ---enable_query_log - -SET GLOBAL innodb_large_prefix = OFF; --echo # Test 1) Show the page size from Information Schema SELECT variable_value FROM information_schema.global_status @@ -942,11 +936,3 @@ COL195 TEXT, COL196 TEXT, COL197 TEXT) row_format=compact,ENGINE=INNODB; - -# -# restore environment to the state it was before this test execution -# - ---disable_query_log -EVAL SET GLOBAL innodb_large_prefix = $innodb_large_prefix_orig; ---enable_query_log 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/innodb/t/innodb-timeout.test b/mysql-test/suite/innodb/t/innodb-timeout.test index 0beeea8f39e..0f8bbbec559 100644 --- a/mysql-test/suite/innodb/t/innodb-timeout.test +++ b/mysql-test/suite/innodb/t/innodb-timeout.test @@ -1,3 +1,5 @@ +# Save the initial number of concurrent sessions. +--source include/count_sessions.inc --source include/have_innodb.inc let $initial_timeout=`select @@innodb_lock_wait_timeout`; @@ -115,3 +117,84 @@ connection default; drop table t1; --replace_result $initial_timeout <initial_timeout> eval set global innodb_lock_wait_timeout=$initial_timeout; + +--echo # +--echo # MDEV-11379 - AliSQL: [Feature] Issue#8: SELECT FOR UPDATE WAIT +--echo # +CREATE TABLE t1 (c1 INT, c2 INT) ENGINE=InnoDB; +INSERT INTO t1 (c1,c2) values (1,1),(2,2),(3,3),(4,4); + +# Not supported in view/sp +--error ER_VIEW_SELECT_CLAUSE +CREATE VIEW v1 AS SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +--error ER_VIEW_SELECT_CLAUSE +CREATE VIEW v1 AS SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; +--error ER_SP_BADSTATEMENT +CREATE PROCEDURE p1() SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +--error ER_SP_BADSTATEMENT +CREATE PROCEDURE p1() SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; + +connect(con1,localhost,root,,); +LOCK TABLE t1 WRITE; + +connect(con2,localhost,root,,); +# The following statement should hang because con1 is locking the table +--error ER_LOCK_WAIT_TIMEOUT +SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; +PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT'; +--error ER_LOCK_WAIT_TIMEOUT +EXECUTE stmt; +DEALLOCATE PREPARE stmt; +PREPARE stmt FROM 'SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0'; +--error ER_LOCK_WAIT_TIMEOUT +EXECUTE stmt; +DEALLOCATE PREPARE stmt; + +connection con1; +INSERT INTO t1 VALUES(5,5); +UNLOCK TABLES; +set AUTOCOMMIT=0; +--disable_result_log +SELECT * FROM t1 WHERE c1=4 FOR UPDATE; +--enable_result_log + +connection con2; +set AUTOCOMMIT=0; +SET INNODB_LOCK_WAIT_TIMEOUT=1; +--error ER_LOCK_WAIT_TIMEOUT +SELECT * FROM t1 WHERE c1=4 FOR UPDATE; +--error ER_LOCK_WAIT_TIMEOUT +SELECT * FROM t1 WHERE c1=4 FOR UPDATE NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 0; + +connection con1; +UPDATE t1 SET c2=5 WHERE c1=4; +COMMIT; +set AUTOCOMMIT=0; +SELECT * FROM t1 WHERE c1=4 FOR UPDATE; + +connection con2; +set AUTOCOMMIT=0; +SET INNODB_LOCK_WAIT_TIMEOUT=1; +--send +--disable_result_log +SELECT * FROM t1 WHERE c1=4 FOR UPDATE WAIT 10; + +connection con1; +COMMIT; + +connection con2; +--reap + + +disconnect con1; +disconnect con2; + +# clear +connection default; +DROP TABLE t1; + +--source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/innodb-trim.opt b/mysql-test/suite/innodb/t/innodb-trim.opt deleted file mode 100644 index c33d075b002..00000000000 --- a/mysql-test/suite/innodb/t/innodb-trim.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb-use-trim=1 diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index c3908abcf34..a4ba60ec94c 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1410,9 +1410,7 @@ source include/varchar.inc; SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; # Embedded server doesn't chdir to data directory --replace_result $MYSQLTEST_VARDIR . master-data/ '' -SET GLOBAL innodb_large_prefix=OFF; create table t1 (v varchar(65530), key(v)); -SET GLOBAL innodb_large_prefix=default; drop table t1; create table t1 (v varchar(65536)); show create table t1; @@ -1580,39 +1578,6 @@ show create table t9; drop table t1, t2, t3, t4, t5, t6, t7, t8, t9; -SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; -SET GLOBAL innodb_large_prefix=OFF; -# these should have their index length trimmed -create table t1 (col1 varchar(768), index(col1)) - character set = latin1 engine = innodb; -create table t2 (col1 varbinary(768), index(col1)) - character set = latin1 engine = innodb; -create table t3 (col1 text, index(col1(768))) - character set = latin1 engine = innodb; -create table t4 (col1 blob, index(col1(768))) - character set = latin1 engine = innodb; -SET GLOBAL innodb_large_prefix=default; - -show create table t1; - -drop table t1, t2, t3, t4; - -# these should be refused -set global innodb_large_prefix=OFF; ---error ER_TOO_LONG_KEY -create table t1 (col1 varchar(768) primary key) - character set = latin1 engine = innodb; ---error ER_TOO_LONG_KEY -create table t2 (col1 varbinary(768) primary key) - character set = latin1 engine = innodb; ---error ER_TOO_LONG_KEY -create table t3 (col1 text, primary key(col1(768))) - character set = latin1 engine = innodb; ---error ER_TOO_LONG_KEY -create table t4 (col1 blob, primary key(col1(768))) - character set = latin1 engine = innodb; -SET sql_mode = default; -set global innodb_large_prefix=default; # # Test improved foreign key error messages (bug #3443) # diff --git a/mysql-test/suite/innodb/t/innodb_bug47167.test b/mysql-test/suite/innodb/t/innodb_bug47167.test deleted file mode 100644 index 88adfc753a9..00000000000 --- a/mysql-test/suite/innodb/t/innodb_bug47167.test +++ /dev/null @@ -1,51 +0,0 @@ ---source include/have_innodb.inc -# This is the unit test for bug #47167. -# It tests setting the global variable "innodb_file_format_max" ( -# originally "innodb_file_format_check") with a user-Defined Variable. - ---source include/not_embedded.inc ---source include/restart_and_reinit.inc - -# Save the value (Antelope) in 'innodb_file_format_max' to -# 'old_innodb_file_format_max' -set @old_innodb_file_format_max=@@innodb_file_format_max; - -# @old_innodb_file_format_max shall have the value of 'Antelope' -select @old_innodb_file_format_max; - -# Reset the value in 'innodb_file_format_max' to 'Barracuda' -set global innodb_file_format_max = Barracuda; - -select @@innodb_file_format_max; - -# Set 'innodb_file_format_max' to its default value, which -# is the latest file format supported in the current release. -set global innodb_file_format_max = DEFAULT; - -select @@innodb_file_format_max; - -# Put the saved value back to 'innodb_file_format_max' -set global innodb_file_format_max = @old_innodb_file_format_max; - -# Check whether 'innodb_file_format_max' get its original value. -select @@innodb_file_format_max; - -# Following are negative tests, all should fail. ---disable_warnings ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format_max = cheetah; - ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format_max = Bear; - ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format_max = on; - ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format_max = off; ---enable_warnings - -# Put the saved value back to 'innodb_file_format_max' ---disable_query_log -set global innodb_file_format_max = @old_innodb_file_format_max; ---enable_query_log diff --git a/mysql-test/suite/innodb/t/innodb_file_format.test b/mysql-test/suite/innodb/t/innodb_file_format.test deleted file mode 100644 index 2c99167ce6e..00000000000 --- a/mysql-test/suite/innodb/t/innodb_file_format.test +++ /dev/null @@ -1,44 +0,0 @@ --- source include/restart_and_reinit.inc --- source include/have_innodb.inc - -let $innodb_file_format_orig=`select @@innodb_file_format`; -let $innodb_file_format_max_orig=`select @@innodb_file_format_max`; - -select @@innodb_file_format; -select @@innodb_file_format_check; -select @@innodb_file_format_max; -set global innodb_file_format=antelope; -set global innodb_file_format=barracuda; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=cheetah; -select @@innodb_file_format; -set global innodb_file_format=default; -select @@innodb_file_format; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=on; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=off; -select @@innodb_file_format; -set global innodb_file_format_max=antelope; -set global innodb_file_format_max=barracuda; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format_max=cheetah; -select @@innodb_file_format_max; -set global innodb_file_format_max=default; -select @@innodb_file_format_max; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=on; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=off; -select @@innodb_file_format_max; -set global innodb_file_format_max=antelope; - -# innodb_file_format_check is read only variable, can be -# set as server startup parameter ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_file_format_check=off; - ---disable_query_log -eval SET GLOBAL innodb_file_format=$innodb_file_format_orig; -eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig; ---enable_query_log diff --git a/mysql-test/suite/innodb/t/innodb_mysql-master.opt b/mysql-test/suite/innodb/t/innodb_mysql-master.opt index a1ee2c096cf..17dd95cd2cc 100644 --- a/mysql-test/suite/innodb/t/innodb_mysql-master.opt +++ b/mysql-test/suite/innodb/t/innodb_mysql-master.opt @@ -1,3 +1,2 @@ --loose-innodb-lock-wait-timeout=2 --default-storage-engine=MyISAM ---loose-innodb-large-prefix=off diff --git a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test index 7fb4037e6bb..c82e67a9a62 100644 --- a/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test +++ b/mysql-test/suite/innodb/t/innodb_prefix_index_restart_server.test @@ -15,10 +15,6 @@ # Test restart the server and "shutdown_server" looks for pid file # which is not there with embedded mode --source include/not_embedded.inc -# Save innodb variables -let $innodb_large_prefix_orig=`select @@innodb_large_prefix`; - -set global innodb_large_prefix=1; #------------------------------------------------------------------------------ # Stop the server in between when prefix index are created and see if state is @@ -97,8 +93,3 @@ SELECT col_1_text = REPEAT("a", 3500) , col_2_text = REPEAT("o", 3500) FROM worklog5743; DROP TABLE worklog5743; - - -#------------------------------------------------------------------------------ - -eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig; diff --git a/mysql-test/suite/innodb/t/innodb_xtradb_compat-master.opt b/mysql-test/suite/innodb/t/innodb_xtradb_compat-master.opt deleted file mode 100644 index 1ee264ee868..00000000000 --- a/mysql-test/suite/innodb/t/innodb_xtradb_compat-master.opt +++ /dev/null @@ -1,38 +0,0 @@ ---innodb-adaptive-hash-index-partitions=16 ---innodb-buffer-pool-populate=1 ---innodb-cleaner-eviction-factor ---innodb-cleaner-flush-chunk-size=16 ---innodb-cleaner_free_list_lwm=1 ---innodb-cleaner-lru-chunk-size=1 ---innodb-cleaner-lsn-age-factor=HIGH_CHECKPOINT ---innodb-cleaner-max-flush-time=1 ---innodb-cleaner-max-lru-time=1 ---innodb-corrupt-table-action=salvage ---innodb-empty-free-list-algorithm=BACKOFF ---innodb-fake-changes ---innodb-file-io-threads=16 ---innodb-foreground-preflush=EXPONENTIAL_BACKOFF ---innodb-kill-idle-transaction=1 ---innodb-locking-fake-changes ---innodb-log-arch-expire-sec=1 ---innodb-log-arch-dir='ttt' ---innodb-log-archive ---innodb-log-block-size=16 ---innodb-log_checksum_algorithm=STRICT_INNODB ---innodb-max-bitmap-file-size=1 ---innodb-max-changed-pages=1 ---innodb-mirrored-log-groups=8 ---innodb-priority-cleaner ---innodb-priority-io ---innodb-priority-master ---innodb-priority-purge ---innodb-sched-priority-cleaner=16 ---innodb-sched-priority-io=16 ---innodb-sched-priority-master=16 ---innodb-sched-priority-purge=16 ---innodb-show-locks-held=16 ---innodb-show-verbose-locks=1 ---innodb-track-changed-pages ---innodb-track-redo-log-now ---innodb-use-global-flush-log-at-trx-commit ---innodb-use-stacktrace diff --git a/mysql-test/suite/innodb/t/innodb_xtradb_compat.test b/mysql-test/suite/innodb/t/innodb_xtradb_compat.test deleted file mode 100644 index 359d93717d5..00000000000 --- a/mysql-test/suite/innodb/t/innodb_xtradb_compat.test +++ /dev/null @@ -1,160 +0,0 @@ ---source include/have_innodb.inc ---source include/have_debug.inc ---source include/not_embedded.inc ---source include/not_windows.inc - -select @@innodb_adaptive_hash_index_partitions, @@innodb_adaptive_hash_index_parts; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_adaptive_hash_index_partitions=1; - -select @@innodb_buffer_pool_populate; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_buffer_pool_populate=1; - -select @@innodb_cleaner_eviction_factor; -set global innodb_cleaner_eviction_factor=1; -select @@innodb_cleaner_eviction_factor; - -select @@innodb_cleaner_flush_chunk_size; -set global innodb_cleaner_flush_chunk_size=8; -select @@innodb_cleaner_flush_chunk_size; - -select @@innodb_cleaner_free_list_lwm; -set global innodb_cleaner_free_list_lwm=1; -select @@innodb_cleaner_free_list_lwm; - -select @@innodb_cleaner_lru_chunk_size; -set global innodb_cleaner_lru_chunk_size=8; -select @@innodb_cleaner_lru_chunk_size; - -select @@innodb_cleaner_lsn_age_factor; -set global innodb_cleaner_lsn_age_factor=HIGH_CHECKPOINT; -select @@innodb_cleaner_lsn_age_factor; - -select @@innodb_cleaner_max_flush_time; -set global innodb_cleaner_max_flush_time=1; -select @@innodb_cleaner_max_flush_time; - -select @@innodb_cleaner_max_lru_time; -set global innodb_cleaner_max_lru_time=1; -select @@innodb_cleaner_max_lru_time; - -select @@innodb_corrupt_table_action; -set global innodb_corrupt_table_action=salvage; -select @@innodb_corrupt_table_action; - -select @@innodb_empty_free_list_algorithm; -set global innodb_empty_free_list_algorithm=BACKOFF; -select @@innodb_empty_free_list_algorithm; - -select @@innodb_fake_changes; -set global innodb_fake_changes=1; -select @@innodb_fake_changes; - ---echo # @@innodb_file_io_threads is absent - -select @@innodb_foreground_preflush; -set global innodb_foreground_preflush=EXPONENTIAL_BACKOFF; -select @@innodb_foreground_preflush; - -select @@innodb_kill_idle_transaction; -set global innodb_kill_idle_transaction=1; -select @@innodb_kill_idle_transaction; - -select @@innodb_locking_fake_changes; -set global innodb_locking_fake_changes=1; -select @@innodb_locking_fake_changes; - -select @@innodb_log_arch_expire_sec; -set global innodb_log_arch_expire_sec=1; -select @@innodb_log_arch_expire_sec; - -select @@innodb_log_block_size; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_log_block_size= 8; - -select @@innodb_log_checksum_algorithm, @@innodb_log_checksums; -set global innodb_log_checksum_algorithm=NONE; -select @@innodb_log_checksum_algorithm, @@innodb_log_checksums; -set global innodb_log_checksum_algorithm=STRICT_INNODB; -select @@innodb_log_checksum_algorithm, @@innodb_log_checksums; - -select @@innodb_max_bitmap_file_size; -set global innodb_max_bitmap_file_size=1; -select @@innodb_max_bitmap_file_size; - -select @@innodb_max_changed_pages; -set global innodb_max_changed_pages=1; -select @@innodb_max_changed_pages; - -select @@innodb_mirrored_log_groups; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_mirrored_log_groups= 4; - -select @@innodb_priority_cleaner; -set global innodb_priority_cleaner=1; -select @@innodb_priority_cleaner; - -select @@innodb_priority_io; -set global innodb_priority_io=1; -select @@innodb_priority_io; - -select @@innodb_priority_master; -set global innodb_priority_master=1; -select @@innodb_priority_master; - -select @@innodb_priority_purge; -set global innodb_priority_purge=1; -select @@innodb_priority_purge; - -select @@innodb_sched_priority_cleaner; -set global innodb_sched_priority_cleaner=8; -select @@innodb_sched_priority_cleaner; - -select @@innodb_sched_priority_io; -set global innodb_sched_priority_io=8; -select @@innodb_sched_priority_io; - -select @@innodb_sched_priority_master; -set global innodb_sched_priority_master=8; -select @@innodb_sched_priority_master; - -select @@innodb_sched_priority_purge; -set global innodb_sched_priority_purge=8; -select @@innodb_sched_priority_purge; - -select @@innodb_show_locks_held; -set global innodb_show_locks_held=8; -select @@innodb_show_locks_held; - -select @@innodb_show_verbose_locks; -set global innodb_show_verbose_locks=1; -select @@innodb_show_verbose_locks; - -select @@innodb_track_changed_pages; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_track_changed_pages=1; - -select @@innodb_track_redo_log_now; -set global innodb_track_redo_log_now=1; -select @@innodb_track_redo_log_now; - -select @@innodb_use_global_flush_log_at_trx_commit; -set global innodb_use_global_flush_log_at_trx_commit=1; -select @@innodb_use_global_flush_log_at_trx_commit; - -select @@innodb_use_stacktrace; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_use_stacktrace=1; - -select @@innodb_log_archive; -set global innodb_log_archive=1; -select @@innodb_log_archive; - -select @@innodb_log_arch_dir; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -set global innodb_log_arch_dir="ttt"; - ---let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err ---let SEARCH_PATTERN=Using [A-Za-z\\-]* is deprecated and the parameter may be removed in future releases. Ignoning the parameter. ---source include/search_pattern_in_file.inc diff --git a/mysql-test/suite/innodb/t/log_corruption.test b/mysql-test/suite/innodb/t/log_corruption.test index 8013cc45830..3bf68cab4cc 100644 --- a/mysql-test/suite/innodb/t/log_corruption.test +++ b/mysql-test/suite/innodb/t/log_corruption.test @@ -165,7 +165,7 @@ EOF --source include/start_mysqld.inc eval $check_no_innodb; --source include/shutdown_mysqld.inc -let SEARCH_PATTERN=InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\. Please follow the instructions at http://dev.mysql.com/doc/refman/5.7/en/upgrading-downgrading.html; +let SEARCH_PATTERN=InnoDB: Unsupported redo log format. The redo log was created with malicious intentions, or perhaps\.; --source include/search_pattern_in_file.inc --echo # valid header, but old-format checkpoint blocks @@ -204,6 +204,21 @@ EOF --source include/start_mysqld.inc eval $check_no_innodb; --source include/shutdown_mysqld.inc +let SEARCH_PATTERN=InnoDB: Upgrade after a crash is not supported\. The redo log was created with malicious intentions, or perhaps, and it appears corrupted\.; +--source include/search_pattern_in_file.inc + +--echo # same, but with current-version header +perl; +die unless open OUT, "+<", "$ENV{bugdir}/ib_logfile0"; +binmode OUT; +print OUT pack("Nx[5]nx[5]", 103, 0x1286), "MariaDB 10.3.1"; +print OUT pack("x[478]N", 0x85021a0f); +close OUT or die; +EOF +--source include/start_mysqld.inc +eval $check_no_innodb; +--source include/shutdown_mysqld.inc + let SEARCH_PATTERN=InnoDB: Invalid log block checksum. block: 2372 checkpoint no: 1 expected: 3362026715 found: 144444122; --source include/search_pattern_in_file.inc let SEARCH_PATTERN=InnoDB: Missing MLOG_CHECKPOINT between the checkpoint 1213964 and the end 1213952\.; @@ -221,9 +236,8 @@ perl; die unless open OUT, "+<", "$ENV{bugdir}/ib_logfile0"; binmode OUT; # header block -print OUT pack("Nx[5]nx[5]", 1, 0x1286); -print OUT "malicious intentions, or perhaps not"; -print OUT pack("x[456]N", 0xd42d53a2); +print OUT pack("Nx[5]nx[5]", 103, 0x1286), "MariaDB 10.3.1"; +print OUT pack("x[478]N", 0x85021a0f); # checkpoint page 1 and all-zero checkpoint 2 print OUT pack("x[13]nCNNx[264]", 0x1286, 12, 0, 0x80c); print OUT pack("H*x[212]Nx[1024]", "590DBAACFE922582", 0xc72d49c4); @@ -281,9 +295,8 @@ perl; die unless open OUT, "+<", "$ENV{bugdir}/ib_logfile0"; binmode OUT; # header block -print OUT pack("Nx[5]nx[5]", 1, 0x1286); -print OUT "ibbackup was here!!!1!"; -print OUT pack("x[470]N", 0x52b54540); +print OUT pack("Nx[5]nx[5]", 103, 0x1286), "MariaDB 10.3.1"; +print OUT pack("x[478]N", 0x85021a0f); # invalid (all-zero) checkpoint page 1 and an empty log page print OUT chr(0) x 1024; # valid checkpoint block 2 @@ -326,9 +339,8 @@ perl; die unless open OUT, "+<", "$ENV{bugdir}/ib_logfile0"; binmode OUT; # header block -print OUT pack("Nx[5]nx[5]", 1, 0x1286); -print OUT "ibbackup was here!!!1!"; -print OUT pack("x[470]N", 0x52b54540); +print OUT pack("Nx[5]nx[5]", 103, 0x1286), "MariaDB 10.3.1"; +print OUT pack("x[478]N", 0x85021a0f); # invalid (all-zero) checkpoint page 1 and an empty log page print OUT chr(0) x 1024; # valid checkpoint block 2 diff --git a/mysql-test/suite/innodb/t/table_flags.test b/mysql-test/suite/innodb/t/table_flags.test index a2dd249f090..7f47b8254e2 100644 --- a/mysql-test/suite/innodb/t/table_flags.test +++ b/mysql-test/suite/innodb/t/table_flags.test @@ -27,7 +27,7 @@ let bugdir= $MYSQLTEST_VARDIR/tmp/table_flags; --let $d=--innodb-data-home-dir=$bugdir --innodb-log-group-home-dir=$bugdir --let $d=$d --innodb-data-file-path=ibdata1:1M:autoextend --let $d=$d --innodb-undo-tablespaces=0 ---let $restart_parameters=$d --innodb-stats-persistent=0 --innodb-file-format=1 +--let $restart_parameters=$d --innodb-stats-persistent=0 --source include/restart_mysqld.inc SET GLOBAL innodb_file_per_table=1; diff --git a/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc b/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc index 424608f251b..03400c79bef 100644 --- a/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc +++ b/mysql-test/suite/innodb_zip/include/innodb_wl6501_error.inc @@ -31,7 +31,6 @@ call mtr.add_suppression("Parent table of FTS auxiliary table " # create test-bed # let $per_table = `select @@innodb_file_per_table`; -let $format = `select @@innodb_file_format`; eval set global innodb_file_per_table = on; let $WL6501_TMP_DIR = `select @@tmpdir`; diff --git a/mysql-test/suite/innodb_zip/include/innodb_wl6501_scale.inc b/mysql-test/suite/innodb_zip/include/innodb_wl6501_scale.inc index bef28a9c484..99bf065c515 100644 --- a/mysql-test/suite/innodb_zip/include/innodb_wl6501_scale.inc +++ b/mysql-test/suite/innodb_zip/include/innodb_wl6501_scale.inc @@ -7,7 +7,6 @@ # create test-bed # let $per_table = `select @@innodb_file_per_table`; -let $format = `select @@innodb_file_format`; let $WL6501_TMP_DIR = `select @@tmpdir`; let $WL6501_DATA_DIR = `select @@datadir`; @@ -108,5 +107,4 @@ drop procedure populate_small; # # remove test-bed # -eval set global innodb_file_format = $format; eval set global innodb_file_per_table = $per_table; diff --git a/mysql-test/suite/innodb_zip/r/16k.result b/mysql-test/suite/innodb_zip/r/16k.result index bfef368ad15..5b3ab412cfc 100644 --- a/mysql-test/suite/innodb_zip/r/16k.result +++ b/mysql-test/suite/innodb_zip/r/16k.result @@ -282,26 +282,6 @@ Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Antelope`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -Got one of the listed errors -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -Got one of the listed errors -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -SET GLOBAL innodb_file_format = `Barracuda`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html # Test 7) This series of tests were moved from innodb-index to here # because the second alter table t1 assumes a 16k page size. # Moving the test allows the rest of innodb-index to be run on all diff --git a/mysql-test/suite/innodb_zip/r/4k.result b/mysql-test/suite/innodb_zip/r/4k.result index 50646fff5d3..36721852b7e 100644 --- a/mysql-test/suite/innodb_zip/r/4k.result +++ b/mysql-test/suite/innodb_zip/r/4k.result @@ -245,28 +245,6 @@ Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Antelope`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE=8 cannot be larger than 4. -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 4. -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -SET GLOBAL innodb_file_format = `Barracuda`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html # Test 7) Not included here; 16k only # Test 8) Test creating a table that could lead to undo log overflow. CREATE TABLE t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob, diff --git a/mysql-test/suite/innodb_zip/r/8k.result b/mysql-test/suite/innodb_zip/r/8k.result index 17ea11880c1..f466b6d1feb 100644 --- a/mysql-test/suite/innodb_zip/r/8k.result +++ b/mysql-test/suite/innodb_zip/r/8k.result @@ -257,27 +257,6 @@ Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Antelope`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -ERROR HY000: Can't create table `test`.`t4` (errno: 140 "Wrong create options") -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t4` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -ERROR HY000: Can't create table `test`.`t5` (errno: 140 "Wrong create options") -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE=16 cannot be larger than 8. -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t5` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -SET GLOBAL innodb_file_format = `Barracuda`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html # Test 7) Not included here; 16k only # Test 8) Test creating a table that could lead to undo log overflow. CREATE TABLE t1(a blob,b blob,c blob,d blob,e blob,f blob,g blob, diff --git a/mysql-test/suite/innodb_zip/r/bug56680.result b/mysql-test/suite/innodb_zip/r/bug56680.result index 40660f435fb..02ec24c98ae 100644 --- a/mysql-test/suite/innodb_zip/r/bug56680.result +++ b/mysql-test/suite/innodb_zip/r/bug56680.result @@ -116,5 +116,8 @@ DF CHECK TABLE bug56680_2; Table Op Msg_type Msg_text test.bug56680_2 check status OK +CHECK TABLE bug56680_2; +Table Op Msg_type Msg_text +test.bug56680_2 check status OK DROP TABLE bug56680_2; DROP TABLE bug56680; diff --git a/mysql-test/suite/innodb_zip/r/create_options.result b/mysql-test/suite/innodb_zip/r/create_options.result index 1c152229b3c..9b9283d5df1 100644 --- a/mysql-test/suite/innodb_zip/r/create_options.result +++ b/mysql-test/suite/innodb_zip/r/create_options.result @@ -1,7 +1,4 @@ SET default_storage_engine=InnoDB; -SET GLOBAL innodb_file_format=`Barracuda`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html SET GLOBAL innodb_file_per_table=ON; SET SESSION innodb_strict_mode = ON; # Test 1) StrictMode=ON, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0 @@ -260,76 +257,10 @@ Warning 1478 InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 1 Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB # Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and -# and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope -# and that they can be set to default values during strict mode. -SET GLOBAL innodb_file_format=Antelope; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4; -Got one of the listed errors -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED; -Got one of the listed errors -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; -ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options") -CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Redundant row_format=REDUNDANT -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT; -SHOW WARNINGS; -Level Code Message -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Compact row_format=COMPACT -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT; -SHOW WARNINGS; -Level Code Message -ALTER TABLE t1 KEY_BLOCK_SIZE=2; -ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'KEY_BLOCK_SIZE' -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1478 Table storage engine 'InnoDB' does not support the create option 'KEY_BLOCK_SIZE' -ALTER TABLE t1 ROW_FORMAT=COMPRESSED; -ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ROW_FORMAT' -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Error 1478 Table storage engine 'InnoDB' does not support the create option 'ROW_FORMAT' -ALTER TABLE t1 ROW_FORMAT=DYNAMIC; -ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ROW_FORMAT' -SHOW WARNINGS; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope. -Error 1478 Table storage engine 'InnoDB' does not support the create option 'ROW_FORMAT' -SET GLOBAL innodb_file_format=Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -DROP TABLE t1; +# and a valid non-zero KEY_BLOCK_SIZE +# can be set to default values during strict mode. CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4; -SET GLOBAL innodb_file_format=Antelope; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html ALTER TABLE t1 ADD COLUMN f1 INT; -Warnings: -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=4. -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Warning 1478 InnoDB: assuming ROW_FORMAT=DYNAMIC. SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -344,9 +275,6 @@ Level Code Message ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; Level Code Message -SET GLOBAL innodb_file_format=Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html # Test 8) StrictMode=ON, Make sure ROW_FORMAT=COMPRESSED # and a valid non-zero KEY_BLOCK_SIZE are rejected with # innodb_file_per_table=OFF and that they can be set to default @@ -744,9 +672,7 @@ Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=15. SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Dynamic key_block_size=15 -# Test 15) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a -valid KEY_BLOCK_SIZE are remembered but not used when ROW_FORMAT -is reverted to Antelope and then used again when ROW_FORMAT=Barracuda. +# Test 15) StrictMode=OFF. DROP TABLE t1; CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; SHOW WARNINGS; @@ -754,27 +680,12 @@ Level Code Message SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Compressed row_format=COMPRESSED key_block_size=1 -SET GLOBAL innodb_file_format=Antelope; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html ALTER TABLE t1 ADD COLUMN f1 INT; -Warnings: -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=1. -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Warning 1478 InnoDB: assuming ROW_FORMAT=DYNAMIC. SHOW WARNINGS; Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=1. -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Warning 1478 InnoDB: assuming ROW_FORMAT=DYNAMIC. SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; TABLE_NAME ROW_FORMAT CREATE_OPTIONS -t1 Dynamic row_format=COMPRESSED key_block_size=1 -SET GLOBAL innodb_file_format=Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html +t1 Compressed row_format=COMPRESSED key_block_size=1 ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; Level Code Message @@ -788,18 +699,12 @@ Level Code Message SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Dynamic row_format=DYNAMIC -SET GLOBAL innodb_file_format=Antelope; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html ALTER TABLE t1 ADD COLUMN f1 INT; SHOW WARNINGS; Level Code Message SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Dynamic row_format=DYNAMIC -SET GLOBAL innodb_file_format=Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; Level Code Message @@ -853,5 +758,3 @@ TABLE_NAME ROW_FORMAT CREATE_OPTIONS t1 Dynamic row_format=DYNAMIC # Cleanup DROP TABLE t1; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix.result b/mysql-test/suite/innodb_zip/r/index_large_prefix.result index df177e8ea2a..58d35cf2603 100644 --- a/mysql-test/suite/innodb_zip/r/index_large_prefix.result +++ b/mysql-test/suite/innodb_zip/r/index_large_prefix.result @@ -94,18 +94,6 @@ create table worklog5743_2(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=2; create table worklog5743_4(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=4; create table worklog5743_8(a1 int, a2 TEXT, a3 TEXT) KEY_BLOCK_SIZE=8; create table worklog5743_16(a1 int, a2 TEXT, a3 TEXT) KEY_BLOCK_SIZE=16; -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create index idx1 on worklog5743_1(a2(4000)); -Got one of the listed errors -show warnings; -Level Code Message -Note 1071 Specified key was too long; max key length is 767 bytes -Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_1(a2(4000)); Got one of the listed errors show warnings; @@ -128,19 +116,6 @@ Error 1118 Row size too large. The maximum row size for the used table type, not create index idx6 on worklog5743_1(a1, a2(428)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -SET sql_mode= ''; -create index idx1 on worklog5743_2(a2(4000)); -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Note 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_2(a2(4000)); ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs show warnings; @@ -163,18 +138,6 @@ Error 1118 Row size too large. The maximum row size for the used table type, not create index idx6 on worklog5743_2(a1, a2(940)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create index idx1 on worklog5743_4(a2(4000)); -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Note 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_4(a2(4000)); ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs show warnings; @@ -197,18 +160,6 @@ Error 1118 Row size too large. The maximum row size for the used table type, not create index idx6 on worklog5743_4(a1, a2(1964)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create index idx1 on worklog5743_8(a2(1000)); -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Note 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_8(a2(3073)); Warnings: Note 1071 Specified key was too long; max key length is 3072 bytes @@ -237,18 +188,6 @@ Error 1071 Specified key was too long; max key length is 3072 bytes create index idx7 on worklog5743_8(a1, a2(2000), a3(1068)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create index idx1 on worklog5743_16(a2(1000)); -Warnings: -Note 1071 Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Note 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_16(a2(3073)); Warnings: Note 1071 Specified key was too long; max key length is 3072 bytes @@ -283,37 +222,21 @@ insert into worklog5743_2 values(9, repeat("a", 10000)); insert into worklog5743_4 values(9, repeat("a", 10000)); insert into worklog5743_8 values(9, repeat("a", 10000), repeat("a", 10000)); insert into worklog5743_16 values(9, repeat("a", 10000), repeat("a", 10000)); -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -insert into worklog5743_1 values(2, repeat("b", 10000)); -insert into worklog5743_2 values(2, repeat("b", 10000)); -insert into worklog5743_4 values(2, repeat("b", 10000)); -insert into worklog5743_8 values(2, repeat("b", 10000), repeat("b", 10000)); -insert into worklog5743_16 values(2, repeat("b", 10000), repeat("b", 10000)); -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html select a1, left(a2, 20) from worklog5743_1; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_2; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_4; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_8; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_16; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb begin; update worklog5743_1 set a1 = 1000; update worklog5743_2 set a1 = 1000; @@ -323,23 +246,18 @@ update worklog5743_16 set a1 = 1000; select a1, left(a2, 20) from worklog5743_1; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_2; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_4; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_8; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_16; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb connection con1; select @@session.tx_isolation; @@session.tx_isolation diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result b/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result index ee3d6967ad8..f1d72fbe281 100644 --- a/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result +++ b/mysql-test/suite/innodb_zip/r/index_large_prefix_4k.result @@ -7,26 +7,26 @@ Level Code Message insert into worklog5743 values(repeat("a", 20000)); update worklog5743 set a = (repeat("b", 16000)); SET sql_mode= ''; -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release create index idx on worklog5743(a(900)); Warnings: -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes SET sql_mode= default; begin; update worklog5743 set a = (repeat("x", 17000)); select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ +connect con1,localhost,root,,; select a = repeat("x", 17000) from worklog5743; a = repeat("x", 17000) 0 select a = repeat("b", 16000) from worklog5743; a = repeat("b", 16000) 1 +connect con2,localhost,root,,; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation @@ -34,6 +34,7 @@ READ-UNCOMMITTED select a = repeat("x", 17000) from worklog5743; a = repeat("x", 17000) 1 +connection default; rollback; drop table worklog5743; ### Test 2 ### @@ -46,23 +47,24 @@ Level Code Message insert into worklog5743 values(9, repeat("a", 10000)); begin; update worklog5743 set a1 = 1111; +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743 NULL ref idx idx 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743`.`a1` AS `a1`,(`test`.`worklog5743`.`a2` = repeat('a',10000)) AS `a2 = repeat("a", 10000)` from `test`.`worklog5743` where (`test`.`worklog5743`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743 ref idx idx 5 const 1 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) 9 1 +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation READ-UNCOMMITTED select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) +connection default; rollback; drop table worklog5743; ### Test 3 ### @@ -71,37 +73,36 @@ create index idx on worklog5743(a1, a2(50)); insert into worklog5743 values(9, repeat("a", 10000)); begin; update worklog5743 set a1 = 2222; +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743 NULL ref idx idx 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743`.`a1` AS `a1`,(`test`.`worklog5743`.`a2` = repeat('a',10000)) AS `a2 = repeat("a", 10000)` from `test`.`worklog5743` where (`test`.`worklog5743`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743 ref idx idx 5 const 1 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) 9 1 +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation READ-UNCOMMITTED select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) +connection default; rollback; drop table worklog5743; ### Test 4 ### create table worklog5743_1(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=1; create table worklog5743_2(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=2; create table worklog5743_4(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=4; -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx1 on worklog5743_1(a2(4000)); -ERROR 42000: Specified key was too long; max key length is 767 bytes +ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs show warnings; Level Code Message -Error 1071 Specified key was too long; max key length is 767 bytes +Note 1071 Specified key was too long; max key length is 768 bytes +Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs create index idx3 on worklog5743_1(a2(436)); ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs show warnings; @@ -118,18 +119,13 @@ Error 1118 Row size too large. The maximum row size for the used table type, not create index idx6 on worklog5743_1(a1, a2(428)); show warnings; Level Code Message -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html SET sql_mode= ''; -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release create index idx1 on worklog5743_2(a2(4000)); Warnings: -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show create table worklog5743_2; Table Create Table worklog5743_2 CREATE TABLE `worklog5743_2` ( @@ -139,16 +135,16 @@ worklog5743_2 CREATE TABLE `worklog5743_2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2 create index idx3 on worklog5743_2(a2(769)); Warnings: -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes create index idx4 on worklog5743_2(a2(768)); Warnings: -Warning 1831 Duplicate index 'idx4' defined on the table 'test.worklog5743_2'. This is deprecated and will be disallowed in a future release +Note 1831 Duplicate index `idx4`. This is deprecated and will be disallowed in a future release show warnings; Level Code Message -Warning 1831 Duplicate index 'idx4' defined on the table 'test.worklog5743_2'. This is deprecated and will be disallowed in a future release +Note 1831 Duplicate index `idx4`. This is deprecated and will be disallowed in a future release create index idx5 on worklog5743_2(a1, a2(765)); ERROR 42000: Specified key was too long; max key length is 768 bytes show warnings; @@ -157,34 +153,31 @@ Error 1071 Specified key was too long; max key length is 768 bytes create index idx6 on worklog5743_2(a1, a2(764)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx1 on worklog5743_4(a2(4000)); Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 767 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show create table worklog5743_4; Table Create Table worklog5743_4 CREATE TABLE `worklog5743_4` ( `a1` int(11) DEFAULT NULL, `a2` text NOT NULL, - KEY `idx1` (`a2`(767)) + KEY `idx1` (`a2`(768)) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4 create index idx3 on worklog5743_4(a2(769)); Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 767 bytes +Note 1071 Specified key was too long; max key length is 768 bytes create index idx4 on worklog5743_4(a2(768)); Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes +Note 1831 Duplicate index `idx4`. This is deprecated and will be disallowed in a future release show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 767 bytes +Note 1831 Duplicate index `idx4`. This is deprecated and will be disallowed in a future release create index idx5 on worklog5743_4(a1, a2(765)); ERROR 42000: Specified key was too long; max key length is 768 bytes show warnings; @@ -197,27 +190,15 @@ SET sql_mode= default; insert into worklog5743_1 values(9, repeat("a", 10000)); insert into worklog5743_2 values(9, repeat("a", 10000)); insert into worklog5743_4 values(9, repeat("a", 10000)); -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -insert into worklog5743_1 values(2, repeat("b", 10000)); -insert into worklog5743_2 values(2, repeat("b", 10000)); -insert into worklog5743_4 values(2, repeat("b", 10000)); -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html select a1, left(a2, 20) from worklog5743_1; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_2; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_4; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb begin; update worklog5743_1 set a1 = 1000; update worklog5743_2 set a1 = 1000; @@ -225,33 +206,25 @@ update worklog5743_4 set a1 = 1000; select a1, left(a2, 20) from worklog5743_1; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_2; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_4; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1, left(a2, 20) from worklog5743_1 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743_1 NULL ref idx6 idx6 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743_1`.`a1` AS `a1`,left(`test`.`worklog5743_1`.`a2`,20) AS `left(a2, 20)` from `test`.`worklog5743_1` where (`test`.`worklog5743_1`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743_1 ref idx6 idx6 5 const 1 explain select a1, left(a2, 20) from worklog5743_2 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743_2 NULL ref idx6 idx6 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743_2`.`a1` AS `a1`,left(`test`.`worklog5743_2`.`a2`,20) AS `left(a2, 20)` from `test`.`worklog5743_2` where (`test`.`worklog5743_2`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743_2 ref idx6 idx6 5 const 1 explain select a1, left(a2, 20) from worklog5743_4 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743_4 NULL ref idx6 idx6 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743_4`.`a1` AS `a1`,left(`test`.`worklog5743_4`.`a2`,20) AS `left(a2, 20)` from `test`.`worklog5743_4` where (`test`.`worklog5743_4`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743_4 ref idx6 idx6 5 const 1 select a1, left(a2, 20) from worklog5743_1 where a1 = 9; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa @@ -261,6 +234,7 @@ a1 left(a2, 20) select a1, left(a2, 20) from worklog5743_4 where a1 = 9; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation @@ -271,6 +245,7 @@ select a1, left(a2, 20) from worklog5743_2 where a1 = 9; a1 left(a2, 20) select a1, left(a2, 20) from worklog5743_4 where a1 = 9; a1 left(a2, 20) +connection default; rollback; drop table worklog5743_1; drop table worklog5743_2; @@ -282,6 +257,7 @@ ERROR 42000: Specified key was too long; max key length is 3072 bytes show warnings; Level Code Message Error 1071 Specified key was too long; max key length is 3072 bytes +Error 1071 Specified key was too long; max key length is 768 bytes drop table worklog5743; create table worklog5743(a1 int, a2 varchar(3072)) ROW_FORMAT=DYNAMIC; create index idx1 on worklog5743(a2); @@ -318,23 +294,24 @@ Level Code Message insert into worklog5743 values(9, repeat("a", 764)); begin; update worklog5743 set a1 = 4444; +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1 from worklog5743 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743 NULL ref idx1 idx1 5 const 1 100.00 Using index -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743`.`a1` AS `a1` from `test`.`worklog5743` where (`test`.`worklog5743`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743 ref idx1 idx1 5 const 1 Using index select a1 from worklog5743 where a1 = 9; a1 9 +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation READ-UNCOMMITTED select a1 from worklog5743 where a1 = 9; a1 +connection default; rollback; drop table worklog5743; ### Test 6 ### @@ -342,7 +319,7 @@ create table worklog5743(a TEXT not null, primary key (a(1000))); ERROR 42000: Specified key was too long; max key length is 768 bytes create table worklog5743(a TEXT) ROW_FORMAT=COMPACT; create index idx on worklog5743(a(768)); -ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx on worklog5743(a(767)); insert into worklog5743 values(repeat("a", 20000)); begin; @@ -351,9 +328,12 @@ update worklog5743 set a = (repeat("x", 25000)); select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ +connection con1; select a = repeat("a", 20000) from worklog5743; a = repeat("a", 20000) 1 +disconnect con1; +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation @@ -362,26 +342,26 @@ select a = repeat("x", 25000) from worklog5743; a = repeat("x", 25000) 1 1 +disconnect con2; +connection default; rollback; drop table worklog5743; ### Test 7 ### create table worklog5743(a TEXT not null) ROW_FORMAT=DYNAMIC; SET sql_mode= ''; -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release create index idx1 on worklog5743(a(769)); Warnings: -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 768 bytes +Note 1071 Specified key was too long; max key length is 768 bytes SET sql_mode= default; create index idx2 on worklog5743(a(768)); Warnings: -Warning 1831 Duplicate index 'idx2' defined on the table 'test.worklog5743'. This is deprecated and will be disallowed in a future release +Note 1831 Duplicate index `idx2`. This is deprecated and will be disallowed in a future release show warnings; Level Code Message -Warning 1831 Duplicate index 'idx2' defined on the table 'test.worklog5743'. This is deprecated and will be disallowed in a future release +Note 1831 Duplicate index `idx2`. This is deprecated and will be disallowed in a future release show create table worklog5743; Table Create Table worklog5743 CREATE TABLE `worklog5743` ( @@ -393,12 +373,12 @@ insert into worklog5743 values(repeat("a", 768)); drop table worklog5743; create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT; create index idx on worklog5743(a(768)); -ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx2 on worklog5743(a(767)); drop table worklog5743; create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT; create index idx on worklog5743(a(768)); -ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx2 on worklog5743(a(767)); drop table worklog5743; SET GLOBAL innodb_file_per_table=1; diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result index efff9129743..f064a823b59 100644 --- a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result +++ b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result @@ -7,26 +7,26 @@ Level Code Message insert into worklog5743 values(repeat("a", 20000)); update worklog5743 set a = (repeat("b", 16000)); SET sql_mode= ''; -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release create index idx on worklog5743(a(2000)); Warnings: -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes SET sql_mode= default; begin; update worklog5743 set a = (repeat("x", 17000)); select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ +connect con1,localhost,root,,; select a = repeat("x", 17000) from worklog5743; a = repeat("x", 17000) 0 select a = repeat("b", 16000) from worklog5743; a = repeat("b", 16000) 1 +connect con2,localhost,root,,; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation @@ -34,6 +34,7 @@ READ-UNCOMMITTED select a = repeat("x", 17000) from worklog5743; a = repeat("x", 17000) 1 +connection default; rollback; drop table worklog5743; ### Test 2 ### @@ -46,23 +47,24 @@ Level Code Message insert into worklog5743 values(9, repeat("a", 10000)); begin; update worklog5743 set a1 = 1000; +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743 NULL ref idx idx 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743`.`a1` AS `a1`,(`test`.`worklog5743`.`a2` = repeat('a',10000)) AS `a2 = repeat("a", 10000)` from `test`.`worklog5743` where (`test`.`worklog5743`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743 ref idx idx 5 const 1 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) 9 1 +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation READ-UNCOMMITTED select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) +connection default; rollback; drop table worklog5743; ### Test 3 ### @@ -71,23 +73,24 @@ create index idx on worklog5743(a1, a2(50)); insert into worklog5743 values(9, repeat("a", 10000)); begin; update worklog5743 set a1 = 1000; +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743 NULL ref idx idx 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743`.`a1` AS `a1`,(`test`.`worklog5743`.`a2` = repeat('a',10000)) AS `a2 = repeat("a", 10000)` from `test`.`worklog5743` where (`test`.`worklog5743`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743 ref idx idx 5 const 1 select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) 9 1 +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation READ-UNCOMMITTED select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9; a1 a2 = repeat("a", 10000) +connection default; rollback; drop table worklog5743; ### Test 4 ### @@ -95,22 +98,12 @@ create table worklog5743_1(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=1; create table worklog5743_2(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=2; create table worklog5743_4(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=4; create table worklog5743_8(a1 int, a2 TEXT, a3 TEXT) KEY_BLOCK_SIZE=8; -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create index idx1 on worklog5743_1(a2(4000)); -ERROR 42000: Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Error 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_1(a2(4000)); -ERROR 42000: Specified key was too long; max key length is 1536 bytes +ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs show warnings; Level Code Message -Error 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes +Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs create index idx3 on worklog5743_1(a2(436)); ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs show warnings; @@ -127,26 +120,11 @@ Error 1118 Row size too large. The maximum row size for the used table type, not create index idx6 on worklog5743_1(a1, a2(428)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -SET sql_mode= ''; -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release -create index idx1 on worklog5743_2(a2(4000)); -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Warning 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_2(a2(4000)); ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs create index idx3 on worklog5743_2(a2(948)); ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs @@ -164,30 +142,18 @@ Error 1118 Row size too large. The maximum row size for the used table type, not create index idx6 on worklog5743_2(a1, a2(940)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create index idx1 on worklog5743_4(a2(4000)); -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Warning 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx3 on worklog5743_4(a2(1537)); Warnings: -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes create index idx4 on worklog5743_4(a2(1536)); Warnings: -Warning 1831 Duplicate index 'idx4' defined on the table 'test.worklog5743_4'. This is deprecated and will be disallowed in a future release +Note 1831 Duplicate index `idx4`. This is deprecated and will be disallowed in a future release show warnings; Level Code Message -Warning 1831 Duplicate index 'idx4' defined on the table 'test.worklog5743_4'. This is deprecated and will be disallowed in a future release +Note 1831 Duplicate index `idx4`. This is deprecated and will be disallowed in a future release create index idx5 on worklog5743_4(a1, a2(1533)); ERROR 42000: Specified key was too long; max key length is 1536 bytes show warnings; @@ -196,30 +162,18 @@ Error 1071 Specified key was too long; max key length is 1536 bytes create index idx6 on worklog5743_4(a1, a2(1532)); show warnings; Level Code Message -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create index idx1 on worklog5743_8(a2(1000)); -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes -show warnings; -Level Code Message -Warning 1071 Specified key was too long; max key length is 767 bytes -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html create index idx2 on worklog5743_8(a2(3073)); Warnings: -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes create index idx3 on worklog5743_8(a2(3072)); Warnings: -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes show warnings; Level Code Message -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes create index idx4 on worklog5743_8(a1, a2(1533)); ERROR 42000: Specified key was too long; max key length is 1536 bytes show warnings; @@ -233,32 +187,18 @@ insert into worklog5743_1 values(9, repeat("a", 10000)); insert into worklog5743_2 values(9, repeat("a", 10000)); insert into worklog5743_4 values(9, repeat("a", 10000)); insert into worklog5743_8 values(9, repeat("a", 10000), repeat("a", 10000)); -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -insert into worklog5743_1 values(2, repeat("b", 10000)); -insert into worklog5743_2 values(2, repeat("b", 10000)); -insert into worklog5743_4 values(2, repeat("b", 10000)); -insert into worklog5743_8 values(2, repeat("b", 10000), repeat("b", 10000)); -set global innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html select a1, left(a2, 20) from worklog5743_1; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_2; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_4; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_8; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa -2 bbbbbbbbbbbbbbbbbbbb begin; update worklog5743_1 set a1 = 1000; update worklog5743_2 set a1 = 1000; @@ -267,42 +207,31 @@ update worklog5743_8 set a1 = 1000; select a1, left(a2, 20) from worklog5743_1; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_2; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_4; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb select a1, left(a2, 20) from worklog5743_8; a1 left(a2, 20) 1000 aaaaaaaaaaaaaaaaaaaa -1000 bbbbbbbbbbbbbbbbbbbb +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1, left(a2, 20) from worklog5743_1 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743_1 NULL ref idx6 idx6 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743_1`.`a1` AS `a1`,left(`test`.`worklog5743_1`.`a2`,20) AS `left(a2, 20)` from `test`.`worklog5743_1` where (`test`.`worklog5743_1`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743_1 ref idx6 idx6 5 const 1 explain select a1, left(a2, 20) from worklog5743_2 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743_2 NULL ref idx6 idx6 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743_2`.`a1` AS `a1`,left(`test`.`worklog5743_2`.`a2`,20) AS `left(a2, 20)` from `test`.`worklog5743_2` where (`test`.`worklog5743_2`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743_2 ref idx6 idx6 5 const 1 explain select a1, left(a2, 20) from worklog5743_4 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743_4 NULL ref idx6 idx6 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743_4`.`a1` AS `a1`,left(`test`.`worklog5743_4`.`a2`,20) AS `left(a2, 20)` from `test`.`worklog5743_4` where (`test`.`worklog5743_4`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743_4 ref idx6 idx6 5 const 1 explain select a1, left(a2, 20) from worklog5743_8 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743_8 NULL ref idx5 idx5 5 const 1 100.00 NULL -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743_8`.`a1` AS `a1`,left(`test`.`worklog5743_8`.`a2`,20) AS `left(a2, 20)` from `test`.`worklog5743_8` where (`test`.`worklog5743_8`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743_8 ref idx5 idx5 5 const 1 select a1, left(a2, 20) from worklog5743_1 where a1 = 9; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa @@ -315,6 +244,7 @@ a1 left(a2, 20) select a1, left(a2, 20) from worklog5743_8 where a1 = 9; a1 left(a2, 20) 9 aaaaaaaaaaaaaaaaaaaa +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation @@ -327,6 +257,7 @@ select a1, left(a2, 20) from worklog5743_4 where a1 = 9; a1 left(a2, 20) select a1, left(a2, 20) from worklog5743_8 where a1 = 9; a1 left(a2, 20) +connection default; rollback; drop table worklog5743_1; drop table worklog5743_2; @@ -363,31 +294,32 @@ insert into worklog5743 values(9, repeat("a", 1532)); update worklog5743 set a1 = 1000; begin; update worklog5743 set a1 = 1000; +connection con1; select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ explain select a1 from worklog5743 where a1 = 9; -id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE worklog5743 NULL ref idx1 idx1 5 const 1 100.00 Using index -Warnings: -Note 1003 /* select#1 */ select `test`.`worklog5743`.`a1` AS `a1` from `test`.`worklog5743` where (`test`.`worklog5743`.`a1` = 9) +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE worklog5743 ref idx1 idx1 5 const 1 Using index select a1 from worklog5743 where a1 = 9; a1 +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation READ-UNCOMMITTED select a1 from worklog5743 where a1 = 9; a1 +connection default; rollback; drop table worklog5743; ### Test 6 ### create table worklog5743(a TEXT not null, primary key (a(1000))) row_format=compact; -ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +ERROR HY000: Index column size too large. The maximum column size is 767 bytes create table worklog5743(a TEXT) row_format=compact; create index idx on worklog5743(a(768)); -ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx on worklog5743(a(767)); insert into worklog5743 values(repeat("a", 20000)); begin; @@ -396,9 +328,12 @@ update worklog5743 set a = (repeat("x", 25000)); select @@session.tx_isolation; @@session.tx_isolation REPEATABLE-READ +connection con1; select a = repeat("a", 20000) from worklog5743; a = repeat("a", 20000) 1 +disconnect con1; +connection con2; SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; select @@session.tx_isolation; @@session.tx_isolation @@ -407,19 +342,19 @@ select a = repeat("x", 25000) from worklog5743; a = repeat("x", 25000) 1 1 +disconnect con2; +connection default; rollback; drop table worklog5743; ### Test 7 ### create table worklog5743(a TEXT not null) ROW_FORMAT=DYNAMIC; SET sql_mode= ''; -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release create index idx1 on worklog5743(a(3073)); Warnings: -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes create index idx2 on worklog5743(a(3072)); Warnings: -Warning 1071 Specified key was too long; max key length is 1536 bytes +Note 1071 Specified key was too long; max key length is 1536 bytes SET sql_mode= default; show create table worklog5743; Table Create Table @@ -431,12 +366,12 @@ worklog5743 CREATE TABLE `worklog5743` ( drop table worklog5743; create table worklog5743(a TEXT not null) ROW_FORMAT=REDUNDANT; create index idx on worklog5743(a(768)); -ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx2 on worklog5743(a(767)); drop table worklog5743; create table worklog5743(a TEXT not null) ROW_FORMAT=COMPACT; create index idx on worklog5743(a(768)); -ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +ERROR HY000: Index column size too large. The maximum column size is 767 bytes create index idx2 on worklog5743(a(767)); drop table worklog5743; SET GLOBAL innodb_file_per_table=1; diff --git a/mysql-test/suite/innodb_zip/r/innodb-zip.result b/mysql-test/suite/innodb_zip/r/innodb-zip.result index c715f77b9ba..92bdb863265 100644 --- a/mysql-test/suite/innodb_zip/r/innodb-zip.result +++ b/mysql-test/suite/innodb_zip/r/innodb-zip.result @@ -7,9 +7,6 @@ table_name row_format data_length index_length SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; set session innodb_strict_mode=0; set global innodb_file_per_table=off; -set global innodb_file_format=`0`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html SET @@global.innodb_stats_on_metadata=ON; create table t0(a int primary key) engine=innodb row_format=compressed; Warnings: @@ -19,7 +16,6 @@ create table t00(a int primary key) engine=innodb key_block_size=4 row_format=compressed; Warnings: Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=4. Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table. Warning 1478 InnoDB: assuming ROW_FORMAT=DYNAMIC. @@ -29,23 +25,17 @@ create table t3(a int primary key) engine=innodb row_format=compact; create table t4(a int primary key) engine=innodb key_block_size=9; Warnings: Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=9. create table t5(a int primary key) engine=innodb key_block_size=1 row_format=redundant; Warnings: Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table. -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=1. set global innodb_file_per_table=on; create table t6(a int primary key) engine=innodb key_block_size=1 row_format=redundant; Warnings: -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=1. -set global innodb_file_format=`1`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html +Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED. create table t7(a int primary key) engine=innodb key_block_size=1 row_format=redundant; Warnings: @@ -159,40 +149,7 @@ count(*) 1 update t1 set c3 = repeat('E', 20000) where c1 = 1; drop table t1; -set global innodb_file_format=`0`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format; -@@innodb_file_format -Antelope -set global innodb_file_format=`1`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format; -@@innodb_file_format -Barracuda -set global innodb_file_format=`2`; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '2' -set global innodb_file_format=`-1`; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '-1' -set global innodb_file_format=`Antelope`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format=`Barracuda`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format=`Cheetah`; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Cheetah' -set global innodb_file_format=`abc`; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'abc' -set global innodb_file_format=`1a`; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '1a' -set global innodb_file_format=``; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '' set global innodb_file_per_table = on; -set global innodb_file_format = `1`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html set innodb_strict_mode = off; create table t1 (id int primary key) engine = innodb key_block_size = 0; drop table t1; @@ -325,84 +282,4 @@ mysqltest_innodb_zip t7 Dynamic {valid} 0 mysqltest_innodb_zip t8 Compact {valid} 0 mysqltest_innodb_zip t9 Redundant {valid} 0 drop table t7, t8, t9; -set global innodb_file_per_table = on; -set global innodb_file_format = `0`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create table t1 (id int primary key) engine = innodb key_block_size = 1; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t1` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t2 (id int primary key) engine = innodb key_block_size = 2; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t2` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t3 (id int primary key) engine = innodb key_block_size = 4; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t3` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t6 (id int primary key) engine = innodb row_format = compressed; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t6` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t7 (id int primary key) engine = innodb row_format = dynamic; -ERROR HY000: Can't create table `mysqltest_innodb_zip`.`t7` (errno: 140 "Wrong create options") -show warnings; -Level Code Message -Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope. -Error 1005 Can't create table `mysqltest_innodb_zip`.`t7` (errno: 140 "Wrong create options") -Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB -create table t8 (id int primary key) engine = innodb row_format = compact; -create table t9 (id int primary key) engine = innodb row_format = redundant; -SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql'; -table_schema table_name row_format data_length index_length -mysqltest_innodb_zip t8 Compact {valid} 0 -mysqltest_innodb_zip t9 Redundant {valid} 0 -drop table t8, t9; -set global innodb_file_per_table=1; -set global innodb_file_format=Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_per_table=on; -set global innodb_file_format=`Barracuda`; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -set global innodb_file_format_max=`Antelope`; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -create table normal_table ( -c1 int -) engine = innodb; -select @@innodb_file_format_max; -@@innodb_file_format_max -Barracuda -create table zip_table ( -c1 int -) engine = innodb key_block_size = 4; -select @@innodb_file_format_max; -@@innodb_file_format_max -Barracuda -set global innodb_file_format_max=`Antelope`; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@innodb_file_format_max; -@@innodb_file_format_max -Antelope -show table status; -select @@innodb_file_format_max; -@@innodb_file_format_max -Barracuda -drop table normal_table, zip_table; DROP DATABASE mysqltest_innodb_zip; diff --git a/mysql-test/suite/innodb_zip/r/wl6501_scale_1.result b/mysql-test/suite/innodb_zip/r/wl6501_scale_1.result index 0064cf2a469..464a97ba2fe 100644 --- a/mysql-test/suite/innodb_zip/r/wl6501_scale_1.result +++ b/mysql-test/suite/innodb_zip/r/wl6501_scale_1.result @@ -109,9 +109,6 @@ drop table t2; drop table t3; drop procedure populate; drop procedure populate_small; -set global innodb_file_format = Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html set global innodb_file_per_table = 1; set innodb_strict_mode=OFF; create procedure populate() @@ -222,9 +219,6 @@ drop table t2; drop table t3; drop procedure populate; drop procedure populate_small; -set global innodb_file_format = Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html set global innodb_file_per_table = 1; set innodb_strict_mode=OFF; create procedure populate() @@ -339,7 +333,4 @@ drop table t2; drop table t3; drop procedure populate; drop procedure populate_small; -set global innodb_file_format = Barracuda; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html set global innodb_file_per_table = 1; diff --git a/mysql-test/suite/innodb_zip/t/16k.test b/mysql-test/suite/innodb_zip/t/16k.test index 884a729410b..b6f8467ebce 100644 --- a/mysql-test/suite/innodb_zip/t/16k.test +++ b/mysql-test/suite/innodb_zip/t/16k.test @@ -298,15 +298,6 @@ SHOW WARNINGS; CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; SHOW WARNINGS; SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Antelope`; ---error ER_ILLEGAL_HA,1005 -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -SHOW WARNINGS; ---error ER_ILLEGAL_HA,1005 -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -SHOW WARNINGS; -SET GLOBAL innodb_file_format = `Barracuda`; - --echo # Test 7) This series of tests were moved from innodb-index to here --echo # because the second alter table t1 assumes a 16k page size. diff --git a/mysql-test/suite/innodb_zip/t/4k.test b/mysql-test/suite/innodb_zip/t/4k.test index cdbed557e1d..9f2db6a540a 100644 --- a/mysql-test/suite/innodb_zip/t/4k.test +++ b/mysql-test/suite/innodb_zip/t/4k.test @@ -247,15 +247,6 @@ SHOW WARNINGS; CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; SHOW WARNINGS; SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Antelope`; ---error ER_CANT_CREATE_TABLE -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -SHOW WARNINGS; ---error ER_CANT_CREATE_TABLE -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -SHOW WARNINGS; -SET GLOBAL innodb_file_format = `Barracuda`; - --echo # Test 7) Not included here; 16k only diff --git a/mysql-test/suite/innodb_zip/t/8k.test b/mysql-test/suite/innodb_zip/t/8k.test index fb440099c85..216c5a7b5b4 100644 --- a/mysql-test/suite/innodb_zip/t/8k.test +++ b/mysql-test/suite/innodb_zip/t/8k.test @@ -264,15 +264,6 @@ SHOW WARNINGS; CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; SHOW WARNINGS; SET GLOBAL innodb_file_per_table = ON; -SET GLOBAL innodb_file_format = `Antelope`; ---error ER_CANT_CREATE_TABLE -CREATE TABLE t4 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=8; -SHOW WARNINGS; ---error ER_CANT_CREATE_TABLE -CREATE TABLE t5 (id int PRIMARY KEY) ENGINE=innodb KEY_BLOCK_SIZE=16; -SHOW WARNINGS; -SET GLOBAL innodb_file_format = `Barracuda`; - --echo # Test 7) Not included here; 16k only diff --git a/mysql-test/suite/innodb_zip/t/bug56680.test b/mysql-test/suite/innodb_zip/t/bug56680.test index da37f6a28b4..f0dc21a1202 100644 --- a/mysql-test/suite/innodb_zip/t/bug56680.test +++ b/mysql-test/suite/innodb_zip/t/bug56680.test @@ -1,20 +1,18 @@ #Want to skip this test from daily Valgrind execution --source include/no_valgrind_without_big.inc +# Embedded server tests do not support restarting. +--source include/not_embedded.inc # # Bug #56680 InnoDB may return wrong results from a case-insensitive index # -- source include/innodb_page_size_small.inc -- disable_query_log -SET @tx_isolation_orig = @@tx_isolation; -SET @innodb_file_per_table_orig = @@innodb_file_per_table; # The flag innodb_change_buffering_debug is only available in debug builds. # It instructs InnoDB to try to evict pages from the buffer pool when # change buffering is possible, so that the change buffer will be used # whenever possible. -- error 0,ER_UNKNOWN_SYSTEM_VARIABLE -SET @innodb_change_buffering_debug_orig = @@innodb_change_buffering_debug; --- error 0,ER_UNKNOWN_SYSTEM_VARIABLE SET GLOBAL innodb_change_buffering_debug = 1; -- enable_query_log SET GLOBAL tx_isolation='REPEATABLE-READ'; @@ -129,11 +127,9 @@ INSERT INTO bug56680_2 VALUES(1,_latin1 0xdf,1); SELECT HEX(b) FROM bug56680_2 LIMIT 3; CHECK TABLE bug56680_2; +--let $shutdown_timeout=1 +--source include/restart_mysqld.inc + +CHECK TABLE bug56680_2; DROP TABLE bug56680_2; DROP TABLE bug56680; - --- disable_query_log -SET GLOBAL tx_isolation = @tx_isolation_orig; -SET GLOBAL innodb_file_per_table = @innodb_file_per_table_orig; --- error 0, ER_UNKNOWN_SYSTEM_VARIABLE -SET GLOBAL innodb_change_buffering_debug = @innodb_change_buffering_debug_orig; diff --git a/mysql-test/suite/innodb_zip/t/create_options.test b/mysql-test/suite/innodb_zip/t/create_options.test index e7303dee8f3..f91cd7d42dd 100644 --- a/mysql-test/suite/innodb_zip/t/create_options.test +++ b/mysql-test/suite/innodb_zip/t/create_options.test @@ -36,8 +36,7 @@ # 4) KEY_BLOCK_SIZE=1,2,4,8 & 16 are incompatible with COMPACT, DYNAMIC & # REDUNDANT. # 5) KEY_BLOCK_SIZE=1,2,4,8 & 16 as well as ROW_FORMAT=COMPRESSED -# are incompatible with innodb_file_format=Antelope -# and innodb_file_per_table=OFF +# are incompatible with innodb_file_per_table=OFF # 6) KEY_BLOCK_SIZE on an ALTER must occur with ROW_FORMAT=COMPRESSED # or ROW_FORMAT=DEFAULT if the ROW_FORMAT was previously specified # as COMPACT, DYNAMIC or REDUNDANT. @@ -49,7 +48,7 @@ # 2. Ignore a bad ROW_FORMAT, defaulting to COMPACT. # 3. Ignore a valid KEY_BLOCK_SIZE when an incompatible but valid # ROW_FORMAT is specified. -# 4. If innodb_file_format=Antelope or innodb_file_per_table=OFF +# 4. If innodb_file_per_table=OFF # it will ignore ROW_FORMAT=COMPRESSED and non-zero KEY_BLOCK_SIZEs. # # See InnoDB documentation page "SQL Compression Syntax Warnings and Errors" @@ -60,13 +59,9 @@ --source include/innodb_page_size_small.inc SET default_storage_engine=InnoDB; ---disable_query_log # These values can change during the test -LET $innodb_file_format_orig=`select @@innodb_file_format`; LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`; ---enable_query_log -SET GLOBAL innodb_file_format=`Barracuda`; SET GLOBAL innodb_file_per_table=ON; # The first half of these tests are with strict mode ON. @@ -215,40 +210,9 @@ CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9; SHOW WARNINGS; --echo # Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and ---echo # and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope ---echo # and that they can be set to default values during strict mode. -SET GLOBAL innodb_file_format=Antelope; ---error ER_ILLEGAL_HA,1005 -CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4; -SHOW WARNINGS; ---error ER_ILLEGAL_HA,1005 -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED; -SHOW WARNINGS; ---error 1005 -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT; -SHOW WARNINGS; -SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -DROP TABLE t1; -CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT; -SHOW WARNINGS; ---error ER_ILLEGAL_HA_CREATE_OPTION -ALTER TABLE t1 KEY_BLOCK_SIZE=2; -SHOW WARNINGS; ---error ER_ILLEGAL_HA_CREATE_OPTION -ALTER TABLE t1 ROW_FORMAT=COMPRESSED; -SHOW WARNINGS; ---error ER_ILLEGAL_HA_CREATE_OPTION -ALTER TABLE t1 ROW_FORMAT=DYNAMIC; -SHOW WARNINGS; -SET GLOBAL innodb_file_format=Barracuda; -DROP TABLE t1; +--echo # and a valid non-zero KEY_BLOCK_SIZE +--echo # can be set to default values during strict mode. CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4; -SET GLOBAL innodb_file_format=Antelope; ALTER TABLE t1 ADD COLUMN f1 INT; SHOW CREATE TABLE t1; SHOW WARNINGS; @@ -256,7 +220,6 @@ ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0; SHOW WARNINGS; ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; -SET GLOBAL innodb_file_format=Barracuda; --echo # Test 8) StrictMode=ON, Make sure ROW_FORMAT=COMPRESSED --echo # and a valid non-zero KEY_BLOCK_SIZE are rejected with @@ -465,18 +428,14 @@ CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=15; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; ---echo # Test 15) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a ---echo valid KEY_BLOCK_SIZE are remembered but not used when ROW_FORMAT ---echo is reverted to Antelope and then used again when ROW_FORMAT=Barracuda. +--echo # Test 15) StrictMode=OFF. DROP TABLE t1; CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_format=Antelope; ALTER TABLE t1 ADD COLUMN f1 INT; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_format=Barracuda; ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; @@ -484,11 +443,9 @@ DROP TABLE t1; CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_format=Antelope; ALTER TABLE t1 ADD COLUMN f1 INT; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; -SET GLOBAL innodb_file_format=Barracuda; ALTER TABLE t1 ADD COLUMN f2 INT; SHOW WARNINGS; SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1'; @@ -526,6 +483,5 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE DROP TABLE t1; --disable_query_log -EVAL SET GLOBAL innodb_file_format=$innodb_file_format_orig; EVAL SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig; --enable_query_log diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix.test b/mysql-test/suite/innodb_zip/t/index_large_prefix.test index d61cce8d484..bc76f52dcbf 100644 --- a/mysql-test/suite/innodb_zip/t/index_large_prefix.test +++ b/mysql-test/suite/innodb_zip/t/index_large_prefix.test @@ -137,11 +137,6 @@ create table worklog5743_16(a1 int, a2 TEXT, a3 TEXT) KEY_BLOCK_SIZE=16; # See page_zip_empty_size() and Bug #47495 for more detail. # Test edge cases for indexes using key_block_size=1 -set global innodb_large_prefix=0; --- error ER_TOO_LONG_KEY,1118 -create index idx1 on worklog5743_1(a2(4000)); -show warnings; -set global innodb_large_prefix=1; -- error ER_TOO_LONG_KEY,1118 create index idx2 on worklog5743_1(a2(4000)); show warnings; @@ -159,12 +154,6 @@ create index idx6 on worklog5743_1(a1, a2(428)); show warnings; # Test edge cases for indexes using key_block_size=2 -set global innodb_large_prefix=0; -# Check index creation behavior without STRICT mode -SET sql_mode= ''; -create index idx1 on worklog5743_2(a2(4000)); -show warnings; -set global innodb_large_prefix=1; -- error ER_TOO_BIG_ROWSIZE create index idx2 on worklog5743_2(a2(4000)); show warnings; @@ -182,10 +171,6 @@ create index idx6 on worklog5743_2(a1, a2(940)); show warnings; # Test edge cases for indexes using key_block_size=4 -set global innodb_large_prefix=0; -create index idx1 on worklog5743_4(a2(4000)); -show warnings; -set global innodb_large_prefix=1; -- error ER_TOO_BIG_ROWSIZE create index idx2 on worklog5743_4(a2(4000)); show warnings; @@ -203,10 +188,6 @@ create index idx6 on worklog5743_4(a1, a2(1964)); show warnings; # Test edge cases for indexes using key_block_size=8 -set global innodb_large_prefix=0; -create index idx1 on worklog5743_8(a2(1000)); -show warnings; -set global innodb_large_prefix=1; create index idx2 on worklog5743_8(a2(3073)); show warnings; create index idx3 on worklog5743_8(a2(3072)); @@ -223,10 +204,6 @@ create index idx7 on worklog5743_8(a1, a2(2000), a3(1068)); show warnings; # Test edge cases for indexes using key_block_size=16 -set global innodb_large_prefix=0; -create index idx1 on worklog5743_16(a2(1000)); -show warnings; -set global innodb_large_prefix=1; create index idx2 on worklog5743_16(a2(3073)); show warnings; create index idx3 on worklog5743_16(a2(3072)); @@ -250,16 +227,6 @@ insert into worklog5743_4 values(9, repeat("a", 10000)); insert into worklog5743_8 values(9, repeat("a", 10000), repeat("a", 10000)); insert into worklog5743_16 values(9, repeat("a", 10000), repeat("a", 10000)); -# Now if we change the global innodb_large_prefix back to 767, -# updates to these indexes should still be allowed. -set global innodb_large_prefix=0; -insert into worklog5743_1 values(2, repeat("b", 10000)); -insert into worklog5743_2 values(2, repeat("b", 10000)); -insert into worklog5743_4 values(2, repeat("b", 10000)); -insert into worklog5743_8 values(2, repeat("b", 10000), repeat("b", 10000)); -insert into worklog5743_16 values(2, repeat("b", 10000), repeat("b", 10000)); -set global innodb_large_prefix=1; - select a1, left(a2, 20) from worklog5743_1; select a1, left(a2, 20) from worklog5743_2; select a1, left(a2, 20) from worklog5743_4; diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test b/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test index a0229abc4f8..1bfff79e94c 100644 --- a/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test +++ b/mysql-test/suite/innodb_zip/t/index_large_prefix_4k.test @@ -136,8 +136,7 @@ create table worklog5743_4(a1 int, a2 TEXT not null) KEY_BLOCK_SIZE=4; # See page_zip_empty_size() and Bug #47495 for more detail. # Test edge cases for indexes using key_block_size=1 -set global innodb_large_prefix=0; --- error ER_TOO_LONG_KEY +-- error ER_TOO_BIG_ROWSIZE create index idx1 on worklog5743_1(a2(4000)); show warnings; -- error ER_TOO_BIG_ROWSIZE @@ -154,7 +153,6 @@ create index idx6 on worklog5743_1(a1, a2(428)); show warnings; # Test edge cases for indexes using key_block_size=2 -set global innodb_large_prefix=1; SET sql_mode= ''; create index idx1 on worklog5743_2(a2(4000)); show warnings; @@ -169,7 +167,6 @@ show warnings; create index idx6 on worklog5743_2(a1, a2(764)); show warnings; # Test edge cases for indexes using key_block_size=4 -set global innodb_large_prefix=0; create index idx1 on worklog5743_4(a2(4000)); show warnings; show create table worklog5743_4; @@ -188,14 +185,6 @@ insert into worklog5743_1 values(9, repeat("a", 10000)); insert into worklog5743_2 values(9, repeat("a", 10000)); insert into worklog5743_4 values(9, repeat("a", 10000)); -# Now if we change the global innodb_large_prefix back to 767, -# updates to these indexes should still be allowed. -set global innodb_large_prefix=0; -insert into worklog5743_1 values(2, repeat("b", 10000)); -insert into worklog5743_2 values(2, repeat("b", 10000)); -insert into worklog5743_4 values(2, repeat("b", 10000)); -set global innodb_large_prefix=1; - select a1, left(a2, 20) from worklog5743_1; select a1, left(a2, 20) from worklog5743_2; select a1, left(a2, 20) from worklog5743_4; diff --git a/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test b/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test index 00a97249a95..cb27a9e9776 100644 --- a/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test +++ b/mysql-test/suite/innodb_zip/t/index_large_prefix_8k.test @@ -138,12 +138,7 @@ create table worklog5743_8(a1 int, a2 TEXT, a3 TEXT) KEY_BLOCK_SIZE=8; # See page_zip_empty_size() and Bug #47495 for more detail. # Test edge cases for indexes using key_block_size=1 -set global innodb_large_prefix=0; --- error ER_TOO_LONG_KEY -create index idx1 on worklog5743_1(a2(4000)); -show warnings; -set global innodb_large_prefix=1; --- error ER_TOO_LONG_KEY +-- error ER_TOO_BIG_ROWSIZE create index idx2 on worklog5743_1(a2(4000)); show warnings; -- error ER_TOO_BIG_ROWSIZE @@ -160,11 +155,6 @@ create index idx6 on worklog5743_1(a1, a2(428)); show warnings; # Test edge cases for indexes using key_block_size=2 -set global innodb_large_prefix=0; -SET sql_mode= ''; -create index idx1 on worklog5743_2(a2(4000)); -show warnings; -set global innodb_large_prefix=1; -- error ER_TOO_BIG_ROWSIZE create index idx2 on worklog5743_2(a2(4000)); show warnings; @@ -182,10 +172,6 @@ create index idx6 on worklog5743_2(a1, a2(940)); show warnings; # Test edge cases for indexes using key_block_size=4 -set global innodb_large_prefix=0; -create index idx1 on worklog5743_4(a2(4000)); -show warnings; -set global innodb_large_prefix=1; create index idx3 on worklog5743_4(a2(1537)); show warnings; create index idx4 on worklog5743_4(a2(1536)); @@ -197,10 +183,6 @@ create index idx6 on worklog5743_4(a1, a2(1532)); show warnings; # Test edge cases for indexes using key_block_size=8 -set global innodb_large_prefix=0; -create index idx1 on worklog5743_8(a2(1000)); -show warnings; -set global innodb_large_prefix=1; create index idx2 on worklog5743_8(a2(3073)); show warnings; create index idx3 on worklog5743_8(a2(3072)); @@ -218,15 +200,6 @@ insert into worklog5743_2 values(9, repeat("a", 10000)); insert into worklog5743_4 values(9, repeat("a", 10000)); insert into worklog5743_8 values(9, repeat("a", 10000), repeat("a", 10000)); -# Now if we change the global innodb_large_prefix back to 767, -# updates to these indexes should still be allowed. -set global innodb_large_prefix=0; -insert into worklog5743_1 values(2, repeat("b", 10000)); -insert into worklog5743_2 values(2, repeat("b", 10000)); -insert into worklog5743_4 values(2, repeat("b", 10000)); -insert into worklog5743_8 values(2, repeat("b", 10000), repeat("b", 10000)); -set global innodb_large_prefix=1; - select a1, left(a2, 20) from worklog5743_1; select a1, left(a2, 20) from worklog5743_2; select a1, left(a2, 20) from worklog5743_4; diff --git a/mysql-test/suite/innodb_zip/t/innodb-zip.test b/mysql-test/suite/innodb_zip/t/innodb-zip.test index a2b55144c61..ff73c99f41d 100644 --- a/mysql-test/suite/innodb_zip/t/innodb-zip.test +++ b/mysql-test/suite/innodb_zip/t/innodb-zip.test @@ -7,16 +7,12 @@ SELECT table_name, row_format, data_length, index_length WHERE table_schema='mysqltest_innodb_zip'; let $per_table=`select @@innodb_file_per_table`; -let $format=`select @@innodb_file_format`; -let $innodb_file_format_orig=`select @@innodb_file_format`; -let $innodb_file_format_max_orig=`select @@innodb_file_format_max`; SET @save_innodb_stats_on_metadata=@@global.innodb_stats_on_metadata; --let $query_i_s = SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb' AND table_schema != 'mysql' set session innodb_strict_mode=0; set global innodb_file_per_table=off; -set global innodb_file_format=`0`; SET @@global.innodb_stats_on_metadata=ON; create table t0(a int primary key) engine=innodb row_format=compressed; @@ -32,7 +28,6 @@ key_block_size=1 row_format=redundant; set global innodb_file_per_table=on; create table t6(a int primary key) engine=innodb key_block_size=1 row_format=redundant; -set global innodb_file_format=`1`; create table t7(a int primary key) engine=innodb key_block_size=1 row_format=redundant; create table t8(a int primary key) engine=innodb @@ -128,34 +123,7 @@ select count(*) from t1 where c4 = repeat('C', 20000); update t1 set c3 = repeat('E', 20000) where c1 = 1; drop table t1; -# -# -# Test innodb_file_format -# -set global innodb_file_format=`0`; -select @@innodb_file_format; -set global innodb_file_format=`1`; -select @@innodb_file_format; --- error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=`2`; --- error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=`-1`; -set global innodb_file_format=`Antelope`; -set global innodb_file_format=`Barracuda`; --- error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=`Cheetah`; --- error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=`abc`; --- error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=`1a`; --- error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format=``; - -#test strict mode. -# this does not work anymore, has been removed from mysqltest -# -- enable_errors set global innodb_file_per_table = on; -set global innodb_file_format = `1`; set innodb_strict_mode = off; create table t1 (id int primary key) engine = innodb key_block_size = 0; @@ -282,79 +250,12 @@ create table t9 (id int primary key) engine = innodb row_format = redundant; --eval $query_i_s drop table t7, t8, t9; -#test valid values with innodb_file_format unset -set global innodb_file_per_table = on; -set global innodb_file_format = `0`; - ---replace_regex / - .*[0-9]*[)]/)/ ---error ER_CANT_CREATE_TABLE -create table t1 (id int primary key) engine = innodb key_block_size = 1; ---replace_regex / - .*[0-9]*[)]/)/ -show warnings; ---replace_regex / - .*[0-9]*[)]/)/ ---error ER_CANT_CREATE_TABLE -create table t2 (id int primary key) engine = innodb key_block_size = 2; ---replace_regex / - .*[0-9]*[)]/)/ -show warnings; ---replace_regex / - .*[0-9]*[)]/)/ ---error ER_CANT_CREATE_TABLE -create table t3 (id int primary key) engine = innodb key_block_size = 4; -show warnings; - -# Tests for key_block_size = 8 and 16 were moved to innodb_16k, innodb_8k -# and innodb_4k since they get different warnings with smaller page sizes. - ---error ER_CANT_CREATE_TABLE -create table t6 (id int primary key) engine = innodb row_format = compressed; ---replace_regex / - .*[0-9]*[)]/)/ -show warnings; ---replace_regex / - .*[0-9]*[)]/)/ ---error ER_CANT_CREATE_TABLE -create table t7 (id int primary key) engine = innodb row_format = dynamic; ---replace_regex / - .*[0-9]*[)]/)/ -show warnings; -create table t8 (id int primary key) engine = innodb row_format = compact; -create table t9 (id int primary key) engine = innodb row_format = redundant; - ---replace_result 16384 {valid} 8192 {valid} 4096 {valid} ---eval $query_i_s -drop table t8, t9; - -eval set global innodb_file_per_table=$per_table; -eval set global innodb_file_format=$format; -# -# Testing of tablespace tagging -# --- disable_info -set global innodb_file_per_table=on; -set global innodb_file_format=`Barracuda`; -set global innodb_file_format_max=`Antelope`; -create table normal_table ( - c1 int -) engine = innodb; -select @@innodb_file_format_max; -create table zip_table ( - c1 int -) engine = innodb key_block_size = 4; -select @@innodb_file_format_max; -set global innodb_file_format_max=`Antelope`; -select @@innodb_file_format_max; --- disable_result_log -show table status; --- enable_result_log -select @@innodb_file_format_max; -drop table normal_table, zip_table; --- disable_result_log - # # restore environment to the state it was before this test execution # -- disable_query_log -eval set global innodb_file_format=$format; eval set global innodb_file_per_table=$per_table; -eval SET GLOBAL innodb_file_format=$innodb_file_format_orig; -eval SET GLOBAL innodb_file_format_max=$innodb_file_format_max_orig; SET @@global.innodb_stats_on_metadata=@save_innodb_stats_on_metadata; --enable_query_log diff --git a/mysql-test/suite/innodb_zip/t/recover.test b/mysql-test/suite/innodb_zip/t/recover.test index 0cfc2b672fb..f32ff3d3783 100644 --- a/mysql-test/suite/innodb_zip/t/recover.test +++ b/mysql-test/suite/innodb_zip/t/recover.test @@ -1,5 +1,4 @@ ---source include/have_innodb.inc ---source include/have_innodb_max_16k.inc +--source include/innodb_page_size_small.inc --source include/not_embedded.inc --disable_query_log diff --git a/mysql-test/suite/mariabackup/suite.opt b/mysql-test/suite/mariabackup/suite.opt index ba78b2d8957..c1255827a84 100644 --- a/mysql-test/suite/mariabackup/suite.opt +++ b/mysql-test/suite/mariabackup/suite.opt @@ -1 +1 @@ ---innodb --loose-changed_page_bitmaps --innodb-file-format=Barracuda
\ No newline at end of file +--innodb --loose-changed_page_bitmaps diff --git a/mysql-test/suite/mariabackup/xb_compressed_encrypted.opt b/mysql-test/suite/mariabackup/xb_compressed_encrypted.opt index e6cbe00bb7c..8baef973470 100644 --- a/mysql-test/suite/mariabackup/xb_compressed_encrypted.opt +++ b/mysql-test/suite/mariabackup/xb_compressed_encrypted.opt @@ -6,4 +6,3 @@ --loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/logkey.txt --innodb_strict_mode --innodb_file_per_table ---innodb_file_format=Barracuda diff --git a/mysql-test/suite/multi_source/gtid_ignore_duplicates.result b/mysql-test/suite/multi_source/gtid_ignore_duplicates.result index 92d096245c7..96627b42c97 100644 --- a/mysql-test/suite/multi_source/gtid_ignore_duplicates.result +++ b/mysql-test/suite/multi_source/gtid_ignore_duplicates.result @@ -65,6 +65,7 @@ include/wait_for_slave_to_start.inc set default_master_connection = ''; connection server_1; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CALL mtr.add_suppression("This change will not take full effect until all SQL threads have been restarted"); CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); BEGIN; @@ -491,17 +492,21 @@ SET GLOBAL slave_parallel_threads= @old_parallel; SET GLOBAL gtid_ignore_duplicates= @old_ignore_duplicates; connection server_1; DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; include/reset_master_slave.inc disconnect server_1; connection server_2; DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; include/reset_master_slave.inc disconnect server_2; connection server_3; DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; include/reset_master_slave.inc disconnect server_3; connection server_4; DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; include/reset_master_slave.inc disconnect server_4; diff --git a/mysql-test/suite/multi_source/gtid_ignore_duplicates.test b/mysql-test/suite/multi_source/gtid_ignore_duplicates.test index 218d91aa7fb..b61da0f0f33 100644 --- a/mysql-test/suite/multi_source/gtid_ignore_duplicates.test +++ b/mysql-test/suite/multi_source/gtid_ignore_duplicates.test @@ -86,6 +86,7 @@ set default_master_connection = ''; --connection server_1 ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +CALL mtr.add_suppression("This change will not take full effect until all SQL threads have been restarted"); CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); BEGIN; @@ -431,20 +432,24 @@ SET GLOBAL gtid_ignore_duplicates= @old_ignore_duplicates; --connection server_1 DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; --source include/reset_master_slave.inc --disconnect server_1 --connection server_2 DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; --source include/reset_master_slave.inc --disconnect server_2 --connection server_3 DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; --source include/reset_master_slave.inc --disconnect server_3 --connection server_4 DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; --source include/reset_master_slave.inc --disconnect server_4 diff --git a/mysql-test/suite/multi_source/gtid_slave_pos.result b/mysql-test/suite/multi_source/gtid_slave_pos.result new file mode 100644 index 00000000000..d57cfc17959 --- /dev/null +++ b/mysql-test/suite/multi_source/gtid_slave_pos.result @@ -0,0 +1,155 @@ +connect slave1,127.0.0.1,root,,,$SERVER_MYPORT_3; +connect master1,127.0.0.1,root,,,$SERVER_MYPORT_1; +connect master2,127.0.0.1,root,,,$SERVER_MYPORT_2; +connection slave1; +CHANGE MASTER 'slave1' TO master_port=MYPORT_1, master_host='127.0.0.1', master_user='root', master_use_gtid=slave_pos; +CHANGE MASTER 'slave2' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root', master_use_gtid=slave_pos; +set default_master_connection = 'slave1'; +START SLAVE; +include/wait_for_slave_to_start.inc +set default_master_connection = 'slave2'; +START SLAVE; +include/wait_for_slave_to_start.inc +set default_master_connection = ''; +connection master1; +SET GLOBAL gtid_domain_id= 1; +SET SESSION gtid_domain_id= 1; +CREATE TABLE t3 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; +CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10)); +INSERT INTO t1 VALUES (1, "initial"); +INSERT INTO t3 VALUES (101, "initial 1"); +include/save_master_gtid.inc +connection master2; +SET GLOBAL gtid_domain_id= 2; +SET SESSION gtid_domain_id= 2; +CREATE TABLE t2 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1, "initial"); +connection slave1; +include/sync_with_master_gtid.inc +connection master2; +include/save_master_gtid.inc +connection slave1; +include/sync_with_master_gtid.inc +*** Add an innodb gtid_slave_pos table. It is not used yet as slaves are already running *** +SET sql_log_bin=0; +CREATE TABLE mysql.gtid_slave_pos_innodb LIKE mysql.gtid_slave_pos; +ALTER TABLE mysql.gtid_slave_pos_innodb ENGINE=InnoDB; +SET sql_log_bin=0; +connection master1; +INSERT INTO t3 VALUES (102, "secondary"); +include/save_master_gtid.inc +connection slave1; +include/sync_with_master_gtid.inc +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +domain_id max(seq_no) +1 5 +2 2 +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos_innodb GROUP BY domain_id; +domain_id max(seq_no) +*** Restart one slave thread, the other keeps running. Now the new table is used *** +connection slave1; +set default_master_connection = 'slave1'; +STOP SLAVE; +include/wait_for_slave_to_stop.inc +START SLAVE; +include/wait_for_slave_to_start.inc +connection master1; +INSERT INTO t1 VALUES (2, "followup"); +include/save_master_gtid.inc +connection slave1; +include/sync_with_master_gtid.inc +connection master2; +INSERT INTO t2 VALUES (2, "secondary2"); +include/save_master_gtid.inc +connection slave1; +include/sync_with_master_gtid.inc +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +domain_id max(seq_no) +1 6 +2 2 +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos_innodb GROUP BY domain_id; +domain_id max(seq_no) +2 3 +*** Remove a gtid_slave_posXXX table, restart one slave *** +*** Get a warning that the change is not yet picked up *** +*** See that updates fail due to trying to use the missing table *** +connection slave1; +SET sql_log_bin=0; +DROP TABLE mysql.gtid_slave_pos_innodb; +SET sql_log_bin=1; +set default_master_connection = 'slave2'; +STOP SLAVE; +include/wait_for_slave_to_stop.inc +START SLAVE; +include/wait_for_slave_to_start.inc +CALL mtr.add_suppression("The table mysql.gtid_slave_pos_innodb was removed."); +connection master2; +INSERT INTO t2 VALUES (3, "tertiary 2"); +connection slave1; +include/wait_for_slave_sql_error.inc [errno=1942] +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +domain_id max(seq_no) +1 6 +2 2 +*** Stop both slaves, see that the drop of mysql.gtid_slave_pos_innodb is now picked up *** +connection slave1; +set default_master_connection = 'slave1'; +STOP SLAVE; +include/wait_for_slave_to_stop.inc +set default_master_connection = 'slave2'; +STOP SLAVE; +include/wait_for_slave_to_stop.inc +set default_master_connection = 'slave1'; +START SLAVE; +include/wait_for_slave_to_start.inc +connection master1; +INSERT INTO t1 VALUES (3, "more stuff"); +include/save_master_gtid.inc +connection slave1; +include/sync_with_master_gtid.inc +set default_master_connection = 'slave2'; +START SLAVE; +include/wait_for_slave_to_start.inc +connection master2; +include/save_master_gtid.inc +connection slave1; +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a b +1 initial +2 followup +3 more stuff +SELECT * FROM t2 ORDER BY a; +a b +1 initial +2 secondary2 +3 tertiary 2 +SELECT * FROM t3 ORDER BY a; +a b +101 initial 1 +102 secondary +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +domain_id max(seq_no) +1 7 +2 4 +connection master1; +DROP TABLE t1; +DROP TABLE t3; +connection master2; +DROP TABLE t2; +connection slave1; +SET GLOBAL gtid_domain_id=0; +STOP ALL SLAVES; +Warnings: +Note 1938 SLAVE 'slave1' stopped +Note 1938 SLAVE 'slave2' stopped +include/reset_master_slave.inc +disconnect slave1; +connection master1; +SET GLOBAL gtid_domain_id=0; +include/reset_master_slave.inc +disconnect master1; +connection master2; +SET GLOBAL gtid_domain_id=0; +include/reset_master_slave.inc +disconnect master2; diff --git a/mysql-test/suite/multi_source/gtid_slave_pos.test b/mysql-test/suite/multi_source/gtid_slave_pos.test new file mode 100644 index 00000000000..c01130f8cd5 --- /dev/null +++ b/mysql-test/suite/multi_source/gtid_slave_pos.test @@ -0,0 +1,173 @@ +--source include/not_embedded.inc +--source include/have_innodb.inc + +# +# Test multiple mysql.gtid_slave_posXXX tables with multiple master connections +# + +--connect (slave1,127.0.0.1,root,,,$SERVER_MYPORT_3) +--connect (master1,127.0.0.1,root,,,$SERVER_MYPORT_1) +--connect (master2,127.0.0.1,root,,,$SERVER_MYPORT_2) + +--connection slave1 +--replace_result $SERVER_MYPORT_1 MYPORT_1 +eval CHANGE MASTER 'slave1' TO master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', master_user='root', master_use_gtid=slave_pos; +--replace_result $SERVER_MYPORT_2 MYPORT_2 +eval CHANGE MASTER 'slave2' TO master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root', master_use_gtid=slave_pos; +set default_master_connection = 'slave1'; +START SLAVE; +--source include/wait_for_slave_to_start.inc +set default_master_connection = 'slave2'; +START SLAVE; +--source include/wait_for_slave_to_start.inc +set default_master_connection = ''; + + +--connection master1 +SET GLOBAL gtid_domain_id= 1; +SET SESSION gtid_domain_id= 1; +CREATE TABLE t3 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; +CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10)); +INSERT INTO t1 VALUES (1, "initial"); +INSERT INTO t3 VALUES (101, "initial 1"); +--source include/save_master_gtid.inc + +--connection master2 +SET GLOBAL gtid_domain_id= 2; +SET SESSION gtid_domain_id= 2; +CREATE TABLE t2 (a INT PRIMARY KEY, b VARCHAR(10)) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1, "initial"); + + +--connection slave1 +--source include/sync_with_master_gtid.inc + +--connection master2 +--source include/save_master_gtid.inc + +--connection slave1 +--source include/sync_with_master_gtid.inc + + +--echo *** Add an innodb gtid_slave_pos table. It is not used yet as slaves are already running *** + +SET sql_log_bin=0; +CREATE TABLE mysql.gtid_slave_pos_innodb LIKE mysql.gtid_slave_pos; +ALTER TABLE mysql.gtid_slave_pos_innodb ENGINE=InnoDB; +SET sql_log_bin=0; + +--connection master1 +INSERT INTO t3 VALUES (102, "secondary"); +--source include/save_master_gtid.inc + +--connection slave1 +--source include/sync_with_master_gtid.inc +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos_innodb GROUP BY domain_id; + +--echo *** Restart one slave thread, the other keeps running. Now the new table is used *** +--connection slave1 +set default_master_connection = 'slave1'; +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +START SLAVE; +--source include/wait_for_slave_to_start.inc + +# Send through a transaction on the slave1 connection, to be sure that it has +# had time to update the state with the new table. +--connection master1 +INSERT INTO t1 VALUES (2, "followup"); +--source include/save_master_gtid.inc +--connection slave1 +--source include/sync_with_master_gtid.inc + +--connection master2 +INSERT INTO t2 VALUES (2, "secondary2"); +--source include/save_master_gtid.inc + +--connection slave1 +--source include/sync_with_master_gtid.inc +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos_innodb GROUP BY domain_id; + +--echo *** Remove a gtid_slave_posXXX table, restart one slave *** +--echo *** Get a warning that the change is not yet picked up *** +--echo *** See that updates fail due to trying to use the missing table *** +--connection slave1 +SET sql_log_bin=0; +DROP TABLE mysql.gtid_slave_pos_innodb; +SET sql_log_bin=1; +set default_master_connection = 'slave2'; +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +START SLAVE; +--source include/wait_for_slave_to_start.inc +CALL mtr.add_suppression("The table mysql.gtid_slave_pos_innodb was removed."); + +--connection master2 +INSERT INTO t2 VALUES (3, "tertiary 2"); + +--connection slave1 +--let $slave_sql_errno= 1942 +--source include/wait_for_slave_sql_error.inc +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; + +--echo *** Stop both slaves, see that the drop of mysql.gtid_slave_pos_innodb is now picked up *** +--connection slave1 +set default_master_connection = 'slave1'; +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +set default_master_connection = 'slave2'; +STOP SLAVE; +--source include/wait_for_slave_to_stop.inc +set default_master_connection = 'slave1'; +START SLAVE; +--source include/wait_for_slave_to_start.inc +# Send through a transaction on the slave1 connection, to be sure that it has +# had time to update the state with the new table. +--connection master1 +INSERT INTO t1 VALUES (3, "more stuff"); +--source include/save_master_gtid.inc +--connection slave1 +--source include/sync_with_master_gtid.inc +set default_master_connection = 'slave2'; +START SLAVE; +--source include/wait_for_slave_to_start.inc + +--connection master2 +--source include/save_master_gtid.inc +--connection slave1 +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +SELECT * FROM t3 ORDER BY a; +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; + + +# Cleanup. +--connection master1 +DROP TABLE t1; +DROP TABLE t3; + +--connection master2 +DROP TABLE t2; + +--connection slave1 +SET GLOBAL gtid_domain_id=0; +--let $wait_condition= SELECT COUNT(*)=0 FROM information_schema.tables WHERE table_name IN ("t1", "t2", "t3") AND table_schema = "test" +--source include/wait_condition.inc +--sorted_result +STOP ALL SLAVES; +--source include/reset_master_slave.inc +--disconnect slave1 + + +--connection master1 +SET GLOBAL gtid_domain_id=0; +--source include/reset_master_slave.inc +--disconnect master1 + +--connection master2 +SET GLOBAL gtid_domain_id=0; +--source include/reset_master_slave.inc +--disconnect master2 diff --git a/mysql-test/suite/parts/t/partition_debug_innodb-master.opt b/mysql-test/suite/parts/t/partition_debug_innodb-master.opt index 5253df4563a..4fa3cb12e29 100644 --- a/mysql-test/suite/parts/t/partition_debug_innodb-master.opt +++ b/mysql-test/suite/parts/t/partition_debug_innodb-master.opt @@ -1 +1 @@ ---loose-innodb-file-format-check --loose-innodb-file-per-table=1 --skip-stack-trace --skip-core-file --loose-innodb-buffer-pool-size=32M +--loose-innodb-file-per-table=1 --skip-stack-trace --skip-core-file --loose-innodb-buffer-pool-size=32M 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/r/rpl_deadlock_innodb.result b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result index 1c9611ba8f0..bb8c45ae4eb 100644 --- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result +++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result @@ -39,7 +39,9 @@ connection slave; BEGIN; SELECT * FROM t1 FOR UPDATE; a +connection slave1; START SLAVE; +connection slave; SELECT COUNT(*) FROM t2; COUNT(*) 0 @@ -61,8 +63,10 @@ BEGIN; SELECT * FROM t1 FOR UPDATE; a 1 +connection slave1; START SLAVE; include/wait_for_slave_sql_error.inc [errno=1205] +connection slave; SELECT COUNT(*) FROM t2; COUNT(*) 0 @@ -92,8 +96,10 @@ SELECT * FROM t1 FOR UPDATE; a 1 1 +connection slave1; START SLAVE; include/wait_for_slave_sql_error.inc [errno=1205] +connection slave; SELECT COUNT(*) FROM t2; COUNT(*) 0 diff --git a/mysql-test/suite/rpl/r/rpl_gtid_crash.result b/mysql-test/suite/rpl/r/rpl_gtid_crash.result index 7b6e95bf718..ed2a2b287e9 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_crash.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_crash.result @@ -88,16 +88,16 @@ include/save_master_gtid.inc connection server_2; include/sync_with_master_gtid.inc include/stop_slave.inc -SET GLOBAL debug_dbug="+d,crash_commit_before"; START SLAVE; +SET GLOBAL debug_dbug="+d,crash_commit_before"; connection server_1; INSERT INTO t1 VALUES (5); include/save_master_gtid.inc connection server_2; include/sync_with_master_gtid.inc include/stop_slave.inc -SET GLOBAL debug_dbug="+d,crash_commit_after"; START SLAVE; +SET GLOBAL debug_dbug="+d,crash_commit_after"; connection server_1; INSERT INTO t1 VALUES (6); include/save_master_gtid.inc diff --git a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result index 7c2471ba37c..62a5b9c3531 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result @@ -12,21 +12,21 @@ connection master; INSERT INTO t1 VALUES (1); connection slave; CALL mtr.add_suppression("Slave: Failed to open mysql.gtid_slave_pos"); -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1944] include/stop_slave.inc ALTER TABLE mysql.gtid_slave_pos CHANGE seq_no seq_no BIGINT UNSIGNED NOT NULL; ALTER TABLE mysql.gtid_slave_pos DROP PRIMARY KEY; ALTER TABLE mysql.gtid_slave_pos ADD PRIMARY KEY (sub_id, domain_id); START SLAVE; -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1944] include/stop_slave.inc ALTER TABLE mysql.gtid_slave_pos DROP PRIMARY KEY; START SLAVE; -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1944] include/stop_slave.inc ALTER TABLE mysql.gtid_slave_pos ADD PRIMARY KEY (sub_id); START SLAVE; -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1944] include/stop_slave.inc ALTER TABLE mysql.gtid_slave_pos DROP PRIMARY KEY; ALTER TABLE mysql.gtid_slave_pos ADD PRIMARY KEY (domain_id, sub_id); diff --git a/mysql-test/suite/rpl/r/rpl_gtid_ignored.result b/mysql-test/suite/rpl/r/rpl_gtid_ignored.result index 8d5b9be2ca0..ac608c3c2a3 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_ignored.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_ignored.result @@ -79,6 +79,7 @@ a 9 connection server_1; DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; SET debug_sync = "reset"; connection server_2; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_mdev4484.result b/mysql-test/suite/rpl/r/rpl_gtid_mdev4484.result index c49207b99fa..aaeb0c8f119 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_mdev4484.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_mdev4484.result @@ -1,5 +1,12 @@ include/master-slave.inc [connection master] +connection slave; +include/stop_slave.inc +SET sql_log_bin=0; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; +SET sql_log_bin=1; +include/start_slave.inc +connection master; CREATE TABLE t1 (i int) ENGINE=InnoDB; connection slave; *** MDEV-4484, incorrect error handling when entries in gtid_slave_pos not found. *** @@ -13,7 +20,6 @@ SET @old_dbug= @@GLOBAL.debug_dbug; SET GLOBAL debug_dbug="+d,gtid_slave_pos_simulate_failed_delete"; SET sql_log_bin= 0; CALL mtr.add_suppression("Can't find file"); -ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; SET sql_log_bin= 1; include/start_slave.inc connection master; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result b/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result index 3f3b5e4344a..ff845794c22 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result @@ -194,7 +194,7 @@ domain_id COUNT(*) *** MDEV-4650: show variables; ERROR 1946 (HY000): Failed to load replication slave GTID position *** connection server_2; SET sql_log_bin=0; -RENAME TABLE mysql.gtid_slave_pos TO mysql.gtid_slave_pos_old; +RENAME TABLE mysql.gtid_slave_pos TO mysql.old_gtid_slave_pos; SET sql_log_bin=1; SHOW VARIABLES; SHOW VARIABLES LIKE 'gtid_slave_pos'; @@ -207,7 +207,7 @@ Level Code Message Error 1146 Table 'mysql.gtid_slave_pos' doesn't exist Error 1946 Failed to load replication slave GTID position from table mysql.gtid_slave_pos SET sql_log_bin=0; -RENAME TABLE mysql.gtid_slave_pos_old TO mysql.gtid_slave_pos; +RENAME TABLE mysql.old_gtid_slave_pos TO mysql.gtid_slave_pos; CALL mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos"); SET sql_log_bin=1; SHOW VARIABLES LIKE 'gtid_slave_pos'; diff --git a/mysql-test/suite/rpl/r/rpl_gtid_until.result b/mysql-test/suite/rpl/r/rpl_gtid_until.result index 886f6cfd2cb..2295aad34ac 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_until.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_until.result @@ -10,6 +10,8 @@ SET s= SUBSTR(s FROM 1 FOR LOCATE(",", s) - 1); RETURN s; END| connection server_2; +include/stop_slave.inc +include/start_slave.inc START SLAVE UNTIL master_gtid_pos = ""; ERROR HY000: Slave is already running include/stop_slave_io.inc diff --git a/mysql-test/suite/rpl/r/rpl_mdev10863.result b/mysql-test/suite/rpl/r/rpl_mdev10863.result index 158d4a921b7..6accd1ee830 100644 --- a/mysql-test/suite/rpl/r/rpl_mdev10863.result +++ b/mysql-test/suite/rpl/r/rpl_mdev10863.result @@ -46,5 +46,6 @@ SET GLOBAL slave_parallel_threads=@old_parallel_threads; SET GLOBAL max_relay_log_size= @old_max_relay; include/start_slave.inc connection server_1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; DROP TABLE t1; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/rpl_mdev12179.result b/mysql-test/suite/rpl/r/rpl_mdev12179.result new file mode 100644 index 00000000000..40059375356 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_mdev12179.result @@ -0,0 +1,265 @@ +include/rpl_init.inc [topology=1->2] +connection server_2; +SET GLOBAL gtid_pos_auto_engines="innodb"; +ERROR HY000: This operation cannot be performed as you have a running slave ''; run STOP SLAVE '' first +include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines + +SELECT @@SESSION.gtid_pos_auto_engines; +ERROR HY000: Variable 'gtid_pos_auto_engines' is a GLOBAL variable +SET GLOBAL gtid_pos_auto_engines= NULL; +ERROR 42000: Variable 'gtid_pos_auto_engines' can't be set to the value of 'NULL' +SET GLOBAL gtid_pos_auto_engines="innodb"; +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines +InnoDB +SET GLOBAL gtid_pos_auto_engines="myisam,innodb"; +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines +MyISAM,InnoDB +SET GLOBAL gtid_pos_auto_engines="innodb,myisam"; +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines +InnoDB,MyISAM +SET GLOBAL gtid_pos_auto_engines="innodb,innodb,myisam,innodb,myisam,myisam,innodb"; +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines +InnoDB,MyISAM +SET GLOBAL gtid_pos_auto_engines=DEFAULT; +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines + +SET GLOBAL gtid_pos_auto_engines=""; +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines + +include/start_slave.inc +connection server_1; +CREATE TABLE t1 (a INT PRIMARY KEY); +INSERT INTO t1 VALUES (1); +SELECT * FROM t1 ORDER BY a; +a +1 +connection server_2; +SELECT * FROM t1 ORDER BY a; +a +1 +include/stop_slave.inc +SET sql_log_bin=0; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; +CREATE TABLE mysql.gtid_slave_pos_innodb LIKE mysql.gtid_slave_pos; +ALTER TABLE mysql.gtid_slave_pos_innodb ENGINE=InnoDB; +INSERT INTO mysql.gtid_slave_pos_innodb SELECT * FROM mysql.gtid_slave_pos; +TRUNCATE mysql.gtid_slave_pos; +SET sql_log_bin=1; +connection server_1; +INSERT INTO t1 VALUES (2); +INSERT INTO t1 VALUES (3); +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +include/save_master_gtid.inc +*** Restart server with --gtid-pos-auto-engines=innodb,myisam *** +connection server_2; +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +*** Verify no new gtid_slave_pos* tables are created *** +SELECT table_name, engine FROM information_schema.tables +WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; +table_name engine +gtid_slave_pos MyISAM +gtid_slave_pos_innodb InnoDB +SELECT @@gtid_pos_auto_engines; +@@gtid_pos_auto_engines +InnoDB,MyISAM +include/stop_slave.inc +SET sql_log_bin=0; +INSERT INTO mysql.gtid_slave_pos_innodb SELECT * FROM mysql.gtid_slave_pos; +DROP TABLE mysql.gtid_slave_pos; +RENAME TABLE mysql.gtid_slave_pos_innodb TO mysql.gtid_slave_pos; +SET sql_log_bin=1; +connection server_1; +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (4); +INSERT INTO t2 VALUES (1); +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +SELECT * FROM t2 ORDER BY a; +a +1 +include/save_master_gtid.inc +*** Restart server with --gtid-pos-auto-engines=myisam,innodb *** +connection server_2; +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +SELECT * FROM t2 ORDER BY a; +a +1 +*** Verify that no new gtid_slave_pos* tables are auto-created *** +SELECT table_name, engine FROM information_schema.tables +WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; +table_name engine +gtid_slave_pos InnoDB +include/stop_slave.inc +SET sql_log_bin=0; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; +SET sql_log_bin=1; +connection server_1; +INSERT INTO t1 VALUES (5); +INSERT INTO t2 VALUES (2); +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +5 +SELECT * FROM t2 ORDER BY a; +a +1 +2 +include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +5 +SELECT * FROM t2 ORDER BY a; +a +1 +2 +*** Verify that mysql.gtid_slave_pos_InnoDB is auto-created *** +SELECT table_name, engine FROM information_schema.tables +WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; +table_name engine +gtid_slave_pos MyISAM +gtid_slave_pos_InnoDB InnoDB +include/stop_slave.inc +SET sql_log_bin=0; +INSERT INTO mysql.gtid_slave_pos SELECT * FROM mysql.gtid_slave_pos_InnoDB; +DROP TABLE mysql.gtid_slave_pos_InnoDB; +SET sql_log_bin=1; +connection server_1; +INSERT INTO t1 VALUES (6); +INSERT INTO t2 VALUES (3); +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +5 +6 +SELECT * FROM t2 ORDER BY a; +a +1 +2 +3 +include/save_master_gtid.inc +*** Restart server without --gtid-pos-auto-engines *** +connection server_2; +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +5 +6 +SELECT * FROM t2 ORDER BY a; +a +1 +2 +3 +*** Verify that no mysql.gtid_slave_pos* table is auto-created *** +SELECT table_name, engine FROM information_schema.tables +WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; +table_name engine +gtid_slave_pos MyISAM +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +domain_id max(seq_no) +0 11 +include/stop_slave.inc +SET GLOBAL gtid_pos_auto_engines="innodb"; +include/start_slave.inc +connection server_1; +INSERT INTO t1 VALUES (7); +INSERT INTO t2 VALUES (4); +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +5 +6 +7 +SELECT * FROM t2 ORDER BY a; +a +1 +2 +3 +4 +include/save_master_gtid.inc +connection server_2; +include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +a +1 +2 +3 +4 +5 +6 +7 +SELECT * FROM t2 ORDER BY a; +a +1 +2 +3 +4 +*** Verify that mysql.gtid_slave_pos_InnoDB is auto-created *** +SELECT table_name, engine FROM information_schema.tables +WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; +table_name engine +gtid_slave_pos MyISAM +gtid_slave_pos_InnoDB InnoDB +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; +domain_id max(seq_no) +0 13 +include/stop_slave.inc +SET GLOBAL gtid_pos_auto_engines=""; +SET sql_log_bin=0; +DROP TABLE mysql.gtid_slave_pos_InnoDB; +SET sql_log_bin=1; +include/start_slave.inc +connection server_1; +DROP TABLE t1, t2; +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/r/show_status_stop_slave_race-7126.result b/mysql-test/suite/rpl/r/show_status_stop_slave_race-7126.result index 64219e3908d..999d9417b3f 100644 --- a/mysql-test/suite/rpl/r/show_status_stop_slave_race-7126.result +++ b/mysql-test/suite/rpl/r/show_status_stop_slave_race-7126.result @@ -3,6 +3,7 @@ include/master-slave.inc call mtr.add_suppression("Master is configured to log replication events"); connection slave; connection slave; +include/wait_for_slave_to_stop.inc start slave; connection master; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_gtid_crash.test b/mysql-test/suite/rpl/t/rpl_gtid_crash.test index b81cbd38cd3..5cf28b6e49a 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_crash.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_crash.test @@ -161,8 +161,8 @@ EOF --write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect wait EOF -SET GLOBAL debug_dbug="+d,crash_commit_before"; START SLAVE; +SET GLOBAL debug_dbug="+d,crash_commit_before"; --connection server_1 INSERT INTO t1 VALUES (5); @@ -185,8 +185,8 @@ EOF --write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect wait EOF -SET GLOBAL debug_dbug="+d,crash_commit_after"; START SLAVE; +SET GLOBAL debug_dbug="+d,crash_commit_after"; --connection server_1 INSERT INTO t1 VALUES (6); diff --git a/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test b/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test index 05da466597e..796f6894f19 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test @@ -17,7 +17,7 @@ INSERT INTO t1 VALUES (1); --connection slave CALL mtr.add_suppression("Slave: Failed to open mysql.gtid_slave_pos"); ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1944 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc @@ -25,19 +25,19 @@ ALTER TABLE mysql.gtid_slave_pos CHANGE seq_no seq_no BIGINT UNSIGNED NOT NULL; ALTER TABLE mysql.gtid_slave_pos DROP PRIMARY KEY; ALTER TABLE mysql.gtid_slave_pos ADD PRIMARY KEY (sub_id, domain_id); START SLAVE; ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1944 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc ALTER TABLE mysql.gtid_slave_pos DROP PRIMARY KEY; START SLAVE; ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1944 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc ALTER TABLE mysql.gtid_slave_pos ADD PRIMARY KEY (sub_id); START SLAVE; ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1944 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_gtid_ignored.test b/mysql-test/suite/rpl/t/rpl_gtid_ignored.test index cb98be3c838..6e927bd5a77 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_ignored.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_ignored.test @@ -129,6 +129,7 @@ SELECT * FROM t1 ORDER BY a; # Clean up. --connection server_1 DROP TABLE t1; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; SET GLOBAL gtid_strict_mode= @old_gtid_strict_mode; SET debug_sync = "reset"; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test b/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test index 43634ec1528..57f78530b01 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test @@ -2,6 +2,18 @@ --source include/have_innodb.inc --source include/have_debug.inc +--connection slave +--source include/stop_slave.inc +# Since we inject an error updating mysql.gtid_slave_pos, we will get different +# output depending on whether it is InnoDB or MyISAM (roll back or no roll +# back). So fix it to make sure we are consistent, in case an earlier test case +# left it as InnoDB. +SET sql_log_bin=0; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; +SET sql_log_bin=1; +--source include/start_slave.inc + +--connection master CREATE TABLE t1 (i int) ENGINE=InnoDB; --sync_slave_with_master @@ -20,10 +32,6 @@ SET @old_dbug= @@GLOBAL.debug_dbug; SET GLOBAL debug_dbug="+d,gtid_slave_pos_simulate_failed_delete"; SET sql_log_bin= 0; CALL mtr.add_suppression("Can't find file"); -# Since we inject an error updating mysql.gtid_slave_pos, we will get different -# output depending on whether it is InnoDB or MyISAM (roll back or no roll -# back). So fix it to make sure we are consistent. -ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; SET sql_log_bin= 1; --source include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test index 09b35011f1f..309debd87c5 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test @@ -232,6 +232,20 @@ EOF SET sql_log_bin= 0; ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; SET sql_log_bin= 1; +# Do a second restart to get the mysql.gtid_slave_pos table loaded with +# the right engine. +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +wait +EOF +--shutdown_server 30 +--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 + --source include/start_slave.inc --connection server_1 @@ -285,7 +299,7 @@ SELECT domain_id, COUNT(*) FROM mysql.gtid_slave_pos GROUP BY domain_id; --connection server_2 SET sql_log_bin=0; --let $old_pos= `SELECT @@GLOBAL.gtid_slave_pos` -RENAME TABLE mysql.gtid_slave_pos TO mysql.gtid_slave_pos_old; +RENAME TABLE mysql.gtid_slave_pos TO mysql.old_gtid_slave_pos; SET sql_log_bin=1; --write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect @@ -313,7 +327,7 @@ SHOW WARNINGS; # Restore things. SET sql_log_bin=0; -RENAME TABLE mysql.gtid_slave_pos_old TO mysql.gtid_slave_pos; +RENAME TABLE mysql.old_gtid_slave_pos TO mysql.gtid_slave_pos; CALL mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos"); SET sql_log_bin=1; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_until.test b/mysql-test/suite/rpl/t/rpl_gtid_until.test index 20d4510ccc8..aa05ecf79ab 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_until.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_until.test @@ -19,6 +19,9 @@ delimiter ;| --connection server_2 --sync_with_master +# Restart SQL thread to pick up ALTER TABLE of mysql.gtid_slave_pos. +--source include/stop_slave.inc +--source include/start_slave.inc # Both replication threads must be stopped for UNTIL master_gtid_pos. --error ER_SLAVE_WAS_RUNNING diff --git a/mysql-test/suite/rpl/t/rpl_mdev10863.test b/mysql-test/suite/rpl/t/rpl_mdev10863.test index 796e770672d..81cdfd84dbe 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev10863.test +++ b/mysql-test/suite/rpl/t/rpl_mdev10863.test @@ -99,6 +99,7 @@ SET GLOBAL max_relay_log_size= @old_max_relay; --source include/start_slave.inc --connection server_1 +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; DROP TABLE t1; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_mdev12179.test b/mysql-test/suite/rpl/t/rpl_mdev12179.test new file mode 100644 index 00000000000..a9113c91797 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_mdev12179.test @@ -0,0 +1,280 @@ +--source include/have_innodb.inc +--let $rpl_topology=1->2 +--source include/rpl_init.inc + +--connection server_2 +--error ER_SLAVE_MUST_STOP +SET GLOBAL gtid_pos_auto_engines="innodb"; +--source include/stop_slave.inc +CHANGE MASTER TO master_use_gtid=slave_pos; + +# Test the @@gtid_pos_auto_engines sysvar. +SELECT @@gtid_pos_auto_engines; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SELECT @@SESSION.gtid_pos_auto_engines; +--error ER_WRONG_VALUE_FOR_VAR +SET GLOBAL gtid_pos_auto_engines= NULL; +SET GLOBAL gtid_pos_auto_engines="innodb"; +SELECT @@gtid_pos_auto_engines; +SET GLOBAL gtid_pos_auto_engines="myisam,innodb"; +SELECT @@gtid_pos_auto_engines; +SET GLOBAL gtid_pos_auto_engines="innodb,myisam"; +SELECT @@gtid_pos_auto_engines; +SET GLOBAL gtid_pos_auto_engines="innodb,innodb,myisam,innodb,myisam,myisam,innodb"; +SELECT @@gtid_pos_auto_engines; +SET GLOBAL gtid_pos_auto_engines=DEFAULT; +SELECT @@gtid_pos_auto_engines; +SET GLOBAL gtid_pos_auto_engines=""; +SELECT @@gtid_pos_auto_engines; + +--source include/start_slave.inc + +--connection server_1 +CREATE TABLE t1 (a INT PRIMARY KEY); +INSERT INTO t1 VALUES (1); +SELECT * FROM t1 ORDER BY a; +--save_master_pos + +--connection server_2 +--sync_with_master +SELECT * FROM t1 ORDER BY a; +--source include/stop_slave.inc +SET sql_log_bin=0; +# Reset storage engine for mysql.gtid_slave_pos in case an earlier test +# might have changed it to InnoDB. +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; +CREATE TABLE mysql.gtid_slave_pos_innodb LIKE mysql.gtid_slave_pos; +ALTER TABLE mysql.gtid_slave_pos_innodb ENGINE=InnoDB; +INSERT INTO mysql.gtid_slave_pos_innodb SELECT * FROM mysql.gtid_slave_pos; +TRUNCATE mysql.gtid_slave_pos; +SET sql_log_bin=1; + +# Restart the slave mysqld server, and verify that the GTID position is +# read correctly from the new mysql.gtid_slave_pos_innodb table. + +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +wait +EOF +--shutdown_server 30 +--source include/wait_until_disconnected.inc + +--connection server_1 +INSERT INTO t1 VALUES (2); +INSERT INTO t1 VALUES (3); +SELECT * FROM t1 ORDER BY a; +--source include/save_master_gtid.inc + +# Let the slave mysqld server start again. +# As we are restarting, also take the opportunity to test --gtid-pos-auto-engines +--echo *** Restart server with --gtid-pos-auto-engines=innodb,myisam *** +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +restart: --skip-slave-start=0 --gtid-pos-auto-engines=innodb,myisam +EOF + +--connection server_2 +--enable_reconnect +--source include/wait_until_connected_again.inc + +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; + +--echo *** Verify no new gtid_slave_pos* tables are created *** +SELECT table_name, engine FROM information_schema.tables + WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; + +SELECT @@gtid_pos_auto_engines; +--source include/stop_slave.inc +SET sql_log_bin=0; +INSERT INTO mysql.gtid_slave_pos_innodb SELECT * FROM mysql.gtid_slave_pos; +DROP TABLE mysql.gtid_slave_pos; +RENAME TABLE mysql.gtid_slave_pos_innodb TO mysql.gtid_slave_pos; +SET sql_log_bin=1; + +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +wait +EOF +--shutdown_server 30 +--source include/wait_until_disconnected.inc + +--connection server_1 +CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; +INSERT INTO t1 VALUES (4); +INSERT INTO t2 VALUES (1); +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +--source include/save_master_gtid.inc + +--echo *** Restart server with --gtid-pos-auto-engines=myisam,innodb *** +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +restart: --skip-slave-start=0 --gtid-pos-auto-engines=myisam,innodb +EOF + +--connection server_2 +--enable_reconnect +--source include/wait_until_connected_again.inc + +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + +--echo *** Verify that no new gtid_slave_pos* tables are auto-created *** +SELECT table_name, engine FROM information_schema.tables + WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; + + +--source include/stop_slave.inc +SET sql_log_bin=0; +ALTER TABLE mysql.gtid_slave_pos ENGINE=MyISAM; +SET sql_log_bin=1; + +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +wait +EOF +--shutdown_server 30 +--source include/wait_until_disconnected.inc + +--connection server_1 +INSERT INTO t1 VALUES (5); +INSERT INTO t2 VALUES (2); +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +--source include/save_master_gtid.inc + +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +--echo *** Restart server with --gtid-pos-auto-engines=innodb *** +restart: --skip-slave-start=0 --gtid-pos-auto-engines=innodb +EOF + +--connection server_2 +--enable_reconnect +--source include/wait_until_connected_again.inc + +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + +--echo *** Verify that mysql.gtid_slave_pos_InnoDB is auto-created *** +# Note, the create happens asynchronously, so wait for it. +let $wait_condition= + SELECT EXISTS (SELECT * FROM information_schema.tables + WHERE table_schema='mysql' AND table_name='gtid_slave_pos_InnoDB'); +--source include/wait_condition.inc +SELECT table_name, engine FROM information_schema.tables + WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; + + +--source include/stop_slave.inc +SET sql_log_bin=0; +INSERT INTO mysql.gtid_slave_pos SELECT * FROM mysql.gtid_slave_pos_InnoDB; +DROP TABLE mysql.gtid_slave_pos_InnoDB; +SET sql_log_bin=1; + +--write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +wait +EOF +--shutdown_server 30 +--source include/wait_until_disconnected.inc + +--connection server_1 +INSERT INTO t1 VALUES (6); +INSERT INTO t2 VALUES (3); +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +--source include/save_master_gtid.inc + +--echo *** Restart server without --gtid-pos-auto-engines *** +--append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +restart: --skip-slave-start=0 +EOF + +--connection server_2 +--enable_reconnect +--source include/wait_until_connected_again.inc + +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + +--echo *** Verify that no mysql.gtid_slave_pos* table is auto-created *** +SELECT table_name, engine FROM information_schema.tables + WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; + +--source include/stop_slave.inc +SET GLOBAL gtid_pos_auto_engines="innodb"; +--source include/start_slave.inc + +--connection server_1 +INSERT INTO t1 VALUES (7); +INSERT INTO t2 VALUES (4); +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; +--source include/save_master_gtid.inc + +--connection server_2 +--source include/sync_with_master_gtid.inc +SELECT * FROM t1 ORDER BY a; +SELECT * FROM t2 ORDER BY a; + +--echo *** Verify that mysql.gtid_slave_pos_InnoDB is auto-created *** +let $wait_condition= + SELECT EXISTS (SELECT * FROM information_schema.tables + WHERE table_schema='mysql' AND table_name='gtid_slave_pos_InnoDB'); +--source include/wait_condition.inc +SELECT table_name, engine FROM information_schema.tables + WHERE table_schema='mysql' AND table_name LIKE 'gtid_slave_pos%' + ORDER BY table_name; +SELECT domain_id, max(seq_no) FROM mysql.gtid_slave_pos GROUP BY domain_id; + +# Check that the auto-created InnoDB table starts being used without +# needing slave restart. The auto-create happens asynchronously, so it +# is non-deterministic when it will start being used. But we can wait +# for it to happen. + +--let $count=300 +--let $done=0 +--let $old_silent= $keep_include_silent +--let $keep_include_silent= 1 +--disable_query_log +while (!$done) +{ + --connection server_1 + INSERT INTO t2(a) SELECT 1+MAX(a) FROM t2; + --source include/save_master_gtid.inc + + --connection server_2 + --source include/sync_with_master_gtid.inc + --let $done=`SELECT COUNT(*) > 0 FROM mysql.gtid_slave_pos_InnoDB` + if (!$done) + { + dec $count; + if (!$count) + { + SELECT * FROM mysql.gtid_slave_pos_InnoDB; + --die Timeout waiting for mysql.gtid_slave_pos_InnoDB to be used + } + real_sleep 0.1; + } +} +--enable_query_log +--let $keep_include_silent=$old_silent +# Note that at this point, the contents of table t2, as well as the GTID +# position, is non-deterministic. + + +#--connection server_2 +--source include/stop_slave.inc +SET GLOBAL gtid_pos_auto_engines=""; +SET sql_log_bin=0; +DROP TABLE mysql.gtid_slave_pos_InnoDB; +SET sql_log_bin=1; +--source include/start_slave.inc + +--connection server_1 +DROP TABLE t1, t2; + +--source include/rpl_end.inc 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/rpl/t/rpl_sync-slave.opt b/mysql-test/suite/rpl/t/rpl_sync-slave.opt index 43dc2062ff0..fc56065731c 100644 --- a/mysql-test/suite/rpl/t/rpl_sync-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_sync-slave.opt @@ -1,2 +1,2 @@ ---sync-relay-log-info=1 --relay-log-recovery=1 --loose-innodb_file_format_check=1 --default-storage-engine=MyISAM --loose-innodb-file-per-table=0 +--sync-relay-log-info=1 --relay-log-recovery=1 --default-storage-engine=MyISAM --loose-innodb-file-per-table=0 --skip-core-file diff --git a/mysql-test/suite/rpl/t/show_status_stop_slave_race-7126.test b/mysql-test/suite/rpl/t/show_status_stop_slave_race-7126.test index 88d7076b1e4..06a9e8ad75b 100644 --- a/mysql-test/suite/rpl/t/show_status_stop_slave_race-7126.test +++ b/mysql-test/suite/rpl/t/show_status_stop_slave_race-7126.test @@ -15,6 +15,7 @@ call mtr.add_suppression("Master is configured to log replication events"); # All done. --connection slave +--source include/wait_for_slave_to_stop.inc start slave; --connection master 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_file_format_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result deleted file mode 100644 index c330bbf5c16..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result +++ /dev/null @@ -1,65 +0,0 @@ -SET @start_global_value = @@global.innodb_file_format; -SELECT @start_global_value; -@start_global_value -Barracuda -Valid values are 'Antelope' and 'Barracuda' -select @@global.innodb_file_format in ('Antelope', 'Barracuda'); -@@global.innodb_file_format in ('Antelope', 'Barracuda') -1 -select @@global.innodb_file_format; -@@global.innodb_file_format -Barracuda -select @@session.innodb_file_format; -ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable -show global variables like 'innodb_file_format'; -Variable_name Value -innodb_file_format Barracuda -show session variables like 'innodb_file_format'; -Variable_name Value -innodb_file_format Barracuda -select * from information_schema.global_variables where variable_name='innodb_file_format'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Barracuda -select * from information_schema.session_variables where variable_name='innodb_file_format'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Barracuda -set global innodb_file_format='Antelope'; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@global.innodb_file_format; -@@global.innodb_file_format -Antelope -select * from information_schema.global_variables where variable_name='innodb_file_format'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Antelope -select * from information_schema.session_variables where variable_name='innodb_file_format'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Antelope -set @@global.innodb_file_format='Barracuda'; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@global.innodb_file_format; -@@global.innodb_file_format -Barracuda -select * from information_schema.global_variables where variable_name='innodb_file_format'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Barracuda -select * from information_schema.session_variables where variable_name='innodb_file_format'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Barracuda -set session innodb_file_format='Salmon'; -ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable and should be set with SET GLOBAL -set @@session.innodb_file_format='Salmon'; -ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable and should be set with SET GLOBAL -set global innodb_file_format=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_file_format' -set global innodb_file_format=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_file_format' -set global innodb_file_format='Salmon'; -ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Salmon' -SET @@global.innodb_file_format = @start_global_value; -Warnings: -Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -SELECT @@global.innodb_file_format; -@@global.innodb_file_format -Barracuda diff --git a/mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result deleted file mode 100644 index 9167585f1d6..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result +++ /dev/null @@ -1,80 +0,0 @@ -SET @start_global_value = @@global.innodb_file_format_check; -SELECT @start_global_value; -@start_global_value -1 -Valid values are 'ON' and 'OFF' -SELECT @@global.innodb_file_format_check in (0, 1); -@@global.innodb_file_format_check in (0, 1) -1 -SELECT @@global.innodb_file_format_check; -@@global.innodb_file_format_check -1 -SELECT @@session.innodb_file_format_check; -ERROR HY000: Variable 'innodb_file_format_check' is a GLOBAL variable -SHOW global variables LIKE 'innodb_file_format_check'; -Variable_name Value -innodb_file_format_check ON -SHOW session variables LIKE 'innodb_file_format_check'; -Variable_name Value -innodb_file_format_check ON -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_check'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_CHECK ON -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_check'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_CHECK ON -SET @@global.innodb_file_format_check='Off'; -ERROR HY000: Variable 'innodb_file_format_check' is a read only variable -Expected error 'Read only variable' -SET @@global.innodb_file_format_check=1; -ERROR HY000: Variable 'innodb_file_format_check' is a read only variable -Expected error 'Read only variable' -SET @@global.innodb_file_format_check=0; -ERROR HY000: Variable 'innodb_file_format_check' is a read only variable -Expected error 'Read only variable' -SET @@global.innodb_file_format_check='On'; -ERROR HY000: Variable 'innodb_file_format_check' is a read only variable -Expected error 'Read only variable' -SET session innodb_large_prefix='OFF'; -ERROR HY000: Variable 'innodb_large_prefix' is a GLOBAL variable and should be set with SET GLOBAL -SET @@session.innodb_stats_on_metadata='ON'; -ERROR HY000: Variable 'innodb_stats_on_metadata' is a GLOBAL variable and should be set with SET GLOBAL -SELECT IF(@@GLOBAL.innodb_file_format_check, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_format_check'; -IF(@@GLOBAL.innodb_file_format_check, "ON", "OFF") = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_file_format_check); -COUNT(@@GLOBAL.innodb_file_format_check) -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_format_check'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -SELECT @@innodb_file_format_check = @@GLOBAL.innodb_file_format_check; -@@innodb_file_format_check = @@GLOBAL.innodb_file_format_check -1 -1 Expected -SELECT COUNT(@@innodb_file_format_check); -COUNT(@@innodb_file_format_check) -1 -1 Expected -SELECT COUNT(@@local.innodb_file_format_check); -ERROR HY000: Variable 'innodb_file_format_check' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@SESSION.innodb_file_format_check); -ERROR HY000: Variable 'innodb_file_format_check' is a GLOBAL variable -Expected error 'Variable is a GLOBAL variable' -SELECT COUNT(@@GLOBAL.innodb_file_format_check); -COUNT(@@GLOBAL.innodb_file_format_check) -1 -1 Expected -SELECT innodb_file_format_check = @@SESSION.innodb_file_format_check; -ERROR 42S22: Unknown column 'innodb_file_format_check' in 'field list' -Expected error 'Readonly variable' diff --git a/mysql-test/suite/sys_vars/r/innodb_file_format_max_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_format_max_basic.result deleted file mode 100644 index 5402e16a424..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_file_format_max_basic.result +++ /dev/null @@ -1,71 +0,0 @@ -SET @start_global_value = @@global.innodb_file_format_max; -SELECT @start_global_value; -@start_global_value -Barracuda -Valid values are 'Antelope' and 'Barracuda' -SELECT @@global.innodb_file_format_max in ('Antelope', 'Barracuda'); -@@global.innodb_file_format_max in ('Antelope', 'Barracuda') -1 -SELECT @@global.innodb_file_format_max; -@@global.innodb_file_format_max -Barracuda -SELECT @@session.innodb_file_format_max; -ERROR HY000: Variable 'innodb_file_format_max' is a GLOBAL variable -SHOW global variables LIKE 'innodb_file_format_max'; -Variable_name Value -innodb_file_format_max Barracuda -SHOW session variables LIKE 'innodb_file_format_max'; -Variable_name Value -innodb_file_format_max Barracuda -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_max'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_MAX Barracuda -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_max'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_MAX Barracuda -SET global innodb_file_format_max='Antelope'; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -SELECT @@global.innodb_file_format_max; -@@global.innodb_file_format_max -Antelope -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_max'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_MAX Antelope -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_max'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_MAX Antelope -SET @@global.innodb_file_format_max='Barracuda'; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -SELECT @@global.innodb_file_format_max; -@@global.innodb_file_format_max -Barracuda -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_max'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_MAX Barracuda -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_max'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT_MAX Barracuda -SET session innodb_file_format_max='Salmon'; -ERROR HY000: Variable 'innodb_file_format_max' is a GLOBAL variable and should be set with SET GLOBAL -SET @@session.innodb_file_format_max='Salmon'; -ERROR HY000: Variable 'innodb_file_format_max' is a GLOBAL variable and should be set with SET GLOBAL -SET global innodb_file_format_max=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_file_format_max' -SET global innodb_file_format_max=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_file_format_max' -SET global innodb_file_format_max='Salmon'; -ERROR 42000: Variable 'innodb_file_format_max' can't be set to the value of 'Salmon' -SET @@global.innodb_file_format_max = @start_global_value; -Warnings: -Warning 131 Using innodb_file_format_max is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -SELECT @@global.innodb_file_format_max; -@@global.innodb_file_format_max -Barracuda 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_instrument_semaphores_basic.result b/mysql-test/suite/sys_vars/r/innodb_instrument_semaphores_basic.result deleted file mode 100644 index 561ddeb5a84..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_instrument_semaphores_basic.result +++ /dev/null @@ -1,57 +0,0 @@ -# -# innodb_instrument_semaphores -# -# save the initial value -SET @innodb_instrument_semaphores_global_saved = @@global.innodb_instrument_semaphores; -# default -SELECT @@global.innodb_instrument_semaphores; -@@global.innodb_instrument_semaphores -0 - -# scope -SELECT @@session.innodb_instrument_semaphores; -ERROR HY000: Variable 'innodb_instrument_semaphores' is a GLOBAL variable -SET @@global.innodb_instrument_semaphores=OFF; -Warnings: -Warning 131 Using innodb_instrument_semaphores is deprecated and the parameter will be removed in MariaDB 10.3. -SELECT @@global.innodb_instrument_semaphores; -@@global.innodb_instrument_semaphores -0 -SET @@global.innodb_instrument_semaphores=ON; -Warnings: -Warning 131 Using innodb_instrument_semaphores is deprecated and the parameter will be removed in MariaDB 10.3. -SELECT @@global.innodb_instrument_semaphores; -@@global.innodb_instrument_semaphores -1 - -# valid values -SET @@global.innodb_instrument_semaphores='OFF'; -Warnings: -Warning 131 Using innodb_instrument_semaphores is deprecated and the parameter will be removed in MariaDB 10.3. -SELECT @@global.innodb_instrument_semaphores; -@@global.innodb_instrument_semaphores -0 -SET @@global.innodb_instrument_semaphores=ON; -Warnings: -Warning 131 Using innodb_instrument_semaphores is deprecated and the parameter will be removed in MariaDB 10.3. -SELECT @@global.innodb_instrument_semaphores; -@@global.innodb_instrument_semaphores -1 -SET @@global.innodb_instrument_semaphores=default; -Warnings: -Warning 131 Using innodb_instrument_semaphores is deprecated and the parameter will be removed in MariaDB 10.3. -SELECT @@global.innodb_instrument_semaphores; -@@global.innodb_instrument_semaphores -0 - -# invalid values -SET @@global.innodb_instrument_semaphores=NULL; -ERROR 42000: Variable 'innodb_instrument_semaphores' can't be set to the value of 'NULL' -SET @@global.innodb_instrument_semaphores='junk'; -ERROR 42000: Variable 'innodb_instrument_semaphores' can't be set to the value of 'junk' - -# restore the initial value -SET @@global.innodb_instrument_semaphores = @innodb_instrument_semaphores_global_saved; -Warnings: -Warning 131 Using innodb_instrument_semaphores is deprecated and the parameter will be removed in MariaDB 10.3. -# End of test 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_large_prefix_basic.result b/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result deleted file mode 100644 index c6e803ffef8..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result +++ /dev/null @@ -1,102 +0,0 @@ -SET @start_global_value = @@global.innodb_large_prefix; -SELECT @start_global_value; -@start_global_value -1 -Valid values are 'ON' and 'OFF' -select @@global.innodb_large_prefix in (0, 1); -@@global.innodb_large_prefix in (0, 1) -1 -select @@global.innodb_large_prefix; -@@global.innodb_large_prefix -1 -select @@session.innodb_large_prefix; -ERROR HY000: Variable 'innodb_large_prefix' is a GLOBAL variable -show global variables like 'innodb_large_prefix'; -Variable_name Value -innodb_large_prefix ON -show session variables like 'innodb_large_prefix'; -Variable_name Value -innodb_large_prefix ON -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -set global innodb_large_prefix='OFF'; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@global.innodb_large_prefix; -@@global.innodb_large_prefix -0 -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX OFF -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX OFF -set @@global.innodb_large_prefix=1; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@global.innodb_large_prefix; -@@global.innodb_large_prefix -1 -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -set global innodb_large_prefix=0; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@global.innodb_large_prefix; -@@global.innodb_large_prefix -0 -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX OFF -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX OFF -set @@global.innodb_large_prefix='ON'; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -select @@global.innodb_large_prefix; -@@global.innodb_large_prefix -1 -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -set session innodb_large_prefix='OFF'; -ERROR HY000: Variable 'innodb_large_prefix' is a GLOBAL variable and should be set with SET GLOBAL -set @@session.innodb_large_prefix='ON'; -ERROR HY000: Variable 'innodb_large_prefix' is a GLOBAL variable and should be set with SET GLOBAL -set global innodb_large_prefix=1.1; -ERROR 42000: Incorrect argument type to variable 'innodb_large_prefix' -set global innodb_large_prefix=1e1; -ERROR 42000: Incorrect argument type to variable 'innodb_large_prefix' -set global innodb_large_prefix=2; -ERROR 42000: Variable 'innodb_large_prefix' can't be set to the value of '2' -set global innodb_large_prefix=-3; -ERROR 42000: Variable 'innodb_large_prefix' can't be set to the value of '-3' -select @@global.innodb_large_prefix; -@@global.innodb_large_prefix -1 -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; -VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX ON -set global innodb_large_prefix='AUTO'; -ERROR 42000: Variable 'innodb_large_prefix' can't be set to the value of 'AUTO' -SET @@global.innodb_large_prefix = @start_global_value; -Warnings: -Warning 131 Using innodb_large_prefix is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html -SELECT @@global.innodb_large_prefix; -@@global.innodb_large_prefix -1 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_lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result index 74b1d21d475..3218c096c2b 100644 --- a/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result @@ -99,7 +99,7 @@ Warnings: Warning 1292 Truncated incorrect innodb_lock_wait_timeout value: '-1024' SELECT @@global.innodb_lock_wait_timeout; @@global.innodb_lock_wait_timeout -1 +0 SET @@global.innodb_lock_wait_timeout=1073741825; Warnings: Warning 1292 Truncated incorrect innodb_lock_wait_timeout value: '1073741825' @@ -131,7 +131,7 @@ Warnings: Warning 1292 Truncated incorrect innodb_lock_wait_timeout value: '-1024' SELECT @@session.innodb_lock_wait_timeout; @@session.innodb_lock_wait_timeout -1 +0 SET @@session.innodb_lock_wait_timeout=1073999999; Warnings: Warning 1292 Truncated incorrect innodb_lock_wait_timeout value: '1073999999' 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_support_xa_basic.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result deleted file mode 100644 index 8384ee3d361..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result +++ /dev/null @@ -1,227 +0,0 @@ -SET @session_start_value = @@session.innodb_support_xa; -SELECT @session_start_value; -@session_start_value -1 -SET @global_start_value = @@global.innodb_support_xa; -SELECT @global_start_value; -@global_start_value -1 -'#--------------------FN_DYNVARS_046_01------------------------#' -SET @@session.innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SET @@session.innodb_support_xa = DEFAULT; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@global.innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SET @@global.innodb_support_xa = DEFAULT; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -'#---------------------FN_DYNVARS_046_02-------------------------#' -SET innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@innodb_support_xa; -@@innodb_support_xa -1 -SELECT session.innodb_support_xa; -ERROR 42S02: Unknown table 'session' in field list -SELECT local.innodb_support_xa; -ERROR 42S02: Unknown table 'local' in field list -SELECT global.innodb_support_xa; -ERROR 42S02: Unknown table 'global' in field list -SET session innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET global innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -'#--------------------FN_DYNVARS_046_03------------------------#' -SET @@session.innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@session.innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@global.innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SET @@global.innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -'#--------------------FN_DYNVARS_046_04-------------------------#' -SET @@session.innodb_support_xa = -0.6; -ERROR 42000: Incorrect argument type to variable 'innodb_support_xa' -SET @@session.innodb_support_xa = 1.6; -ERROR 42000: Incorrect argument type to variable 'innodb_support_xa' -SET @@session.innodb_support_xa = "T"; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'T' -SET @@session.innodb_support_xa = "Y"; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'Y' -SET @@session.innodb_support_xa = TRÜE; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'TRÜE' -SET @@session.innodb_support_xa = ÕN; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'ÕN' -SET @@session.innodb_support_xa = OF; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@session.innodb_support_xa = ÓFF; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'ÓFF' -SET @@global.innodb_support_xa = -1; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '-1' -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SET @@global.innodb_support_xa = 2; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '2' -SET @@global.innodb_support_xa = "T"; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'T' -SET @@global.innodb_support_xa = "Y"; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'Y' -SET @@global.innodb_support_xa = TRÜE; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'TRÜE' -SET @@global.innodb_support_xa = ÕN; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'ÕN' -SET @@global.innodb_support_xa = OF; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SET @@global.innodb_support_xa = ÓFF; -ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'ÓFF' -'#-------------------FN_DYNVARS_046_05----------------------------#' -SET @@global.innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SET @@session.innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@global.innodb_support_xa AS res_is_0; -res_is_0 -1 -SET @@global.innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@session.innodb_support_xa AS res_is_1; -res_is_1 -1 -'#----------------------FN_DYNVARS_046_06------------------------#' -SELECT IF(@@global.innodb_support_xa, "ON", "OFF") = -VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_support_xa'; -IF(@@global.innodb_support_xa, "ON", "OFF") = -VARIABLE_VALUE -1 -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_support_xa'; -VARIABLE_VALUE -ON -'#----------------------FN_DYNVARS_046_07------------------------#' -SELECT IF(@@session.innodb_support_xa, "ON", "OFF") = -VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='innodb_support_xa'; -IF(@@session.innodb_support_xa, "ON", "OFF") = -VARIABLE_VALUE -1 -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES -WHERE VARIABLE_NAME='innodb_support_xa'; -VARIABLE_VALUE -ON -'#---------------------FN_DYNVARS_046_08-------------------------#' -SET @@session.innodb_support_xa = OFF; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@session.innodb_support_xa = ON; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@global.innodb_support_xa = OFF; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SET @@global.innodb_support_xa = ON; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -'#---------------------FN_DYNVARS_046_09----------------------#' -SET @@session.innodb_support_xa = TRUE; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@session.innodb_support_xa = FALSE; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@global.innodb_support_xa = TRUE; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SET @@global.innodb_support_xa = FALSE; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SET @@session.innodb_support_xa = @session_start_value; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -SET @@global.innodb_support_xa = @global_start_value; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 diff --git a/mysql-test/suite/sys_vars/r/innodb_support_xa_func.result b/mysql-test/suite/sys_vars/r/innodb_support_xa_func.result deleted file mode 100644 index 376cc7dd076..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_support_xa_func.result +++ /dev/null @@ -1,90 +0,0 @@ -'#--------------------FN_DYNVARS_046_01-------------------------#' -SET @@global.innodb_support_xa = OFF; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -connect con1,localhost,root,,,,; -connection con1; -SELECT @@global.innodb_support_xa; -@@global.innodb_support_xa -1 -SELECT @@session.innodb_support_xa; -@@session.innodb_support_xa -1 -disconnect con1; -'#--------------------FN_DYNVARS_046_01-------------------------#' -connection default; -SET @@global.innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -drop table if exists t1, t2; -create table t1 (a int) engine=innodb; -'---check when innodb_support_xa is 1---' -SET @@innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -xa start 'test1'; -INSERT t1 values (10); -xa end 'test1'; -xa prepare 'test1'; -xa rollback 'test1'; -SELECT * from t1; -a -'---check when innodb_support_xa is 0---' -SET @@innodb_support_xa = 0; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. Only innodb_support_xa=ON is allowed. -xa start 'test1'; -INSERT t1 values (10); -xa end 'test1'; -xa prepare 'test1'; -xa rollback 'test1'; -SELECT * from t1; -a -'------general xa testing--------' -SET @@global.innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -SET @@innodb_support_xa = 1; -Warnings: -Warning 131 Using innodb_support_xa is deprecated and the parameter may be removed in future releases. -xa start 'testa','testb'; -INSERT t1 values (30); -COMMIT; -ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state -xa end 'testa','testb'; -BEGIN; -ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the IDLE state -CREATE table t2 (a int); -ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the IDLE state -CONNECT con1,localhost,root,,,,; -connection con1; -xa start 'testa','testb'; -ERROR XAE08: XAER_DUPID: The XID already exists -xa start 'testa','testb', 123; -ERROR XAE08: XAER_DUPID: The XID already exists -xa start 0x7465737462, 0x2030405060, 0xb; -INSERT t1 values (40); -xa end 'testb',' 0@P`',11; -xa prepare 'testb',0x2030405060,11; -START TRANSACTION; -ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the PREPARED state -xa recover; -formatID gtrid_length bqual_length data -11 5 5 testb 0@P` -connection default; -xa prepare 'testa','testb'; -xa recover; -formatID gtrid_length bqual_length data -11 5 5 testb 0@P` -1 5 5 testatestb -xa commit 'testb',0x2030405060,11; -ERROR XAE04: XAER_NOTA: Unknown XID -xa commit 'testa','testb'; -connection con1; -xa rollback 'testb',0x2030405060,11; -SELECT * from t1; -a -30 -disconnect con1; -connection default; -DROP table t1; 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/innodb_use_trim_basic.result b/mysql-test/suite/sys_vars/r/innodb_use_trim_basic.result deleted file mode 100644 index 855bccad522..00000000000 --- a/mysql-test/suite/sys_vars/r/innodb_use_trim_basic.result +++ /dev/null @@ -1,37 +0,0 @@ -SET @start_use_trim = @@global.innodb_use_trim; -SELECT @start_use_trim; -@start_use_trim -1 -SELECT COUNT(@@GLOBAL.innodb_use_trim); -COUNT(@@GLOBAL.innodb_use_trim) -1 -1 Expected -SET @@GLOBAL.innodb_use_trim=1; -Warnings: -Warning 131 Using innodb_use_trim is deprecated and the parameter will be removed in MariaDB 10.3. -SELECT COUNT(@@GLOBAL.innodb_use_trim); -COUNT(@@GLOBAL.innodb_use_trim) -1 -1 Expected -SELECT IF(@@GLOBAL.innodb_use_trim, 'ON', 'OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_trim'; -IF(@@GLOBAL.innodb_use_trim, 'ON', 'OFF') = VARIABLE_VALUE -1 -1 Expected -SELECT COUNT(@@GLOBAL.innodb_use_trim); -COUNT(@@GLOBAL.innodb_use_trim) -1 -1 Expected -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_trim'; -COUNT(VARIABLE_VALUE) -1 -1 Expected -SET @@global.innodb_use_trim = @start_use_trim; -Warnings: -Warning 131 Using innodb_use_trim is deprecated and the parameter will be removed in MariaDB 10.3. -SELECT @@global.innodb_use_trim; -@@global.innodb_use_trim -1 diff --git a/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result index bc127bf339a..f5d66b7c561 100644 --- a/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result +++ b/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result @@ -54,17 +54,15 @@ SELECT @@session.lock_wait_timeout; 65535 '#------------------FN_DYNVARS_002_05-----------------------#' SET @@global.lock_wait_timeout = 0; -Warnings: -Warning 1292 Truncated incorrect lock_wait_timeout value: '0' SELECT @@global.lock_wait_timeout; @@global.lock_wait_timeout -1 +0 SET @@global.lock_wait_timeout = -1024; Warnings: Warning 1292 Truncated incorrect lock_wait_timeout value: '-1024' SELECT @@global.lock_wait_timeout; @@global.lock_wait_timeout -1 +0 SET @@global.lock_wait_timeout = 31536001; Warnings: Warning 1292 Truncated incorrect lock_wait_timeout value: '31536001' @@ -87,17 +85,15 @@ SELECT @@global.lock_wait_timeout; @@global.lock_wait_timeout 31536000 SET @@session.lock_wait_timeout = 0; -Warnings: -Warning 1292 Truncated incorrect lock_wait_timeout value: '0' SELECT @@session.lock_wait_timeout; @@session.lock_wait_timeout -1 +0 SET @@session.lock_wait_timeout = -2; Warnings: Warning 1292 Truncated incorrect lock_wait_timeout value: '-2' SELECT @@session.lock_wait_timeout; @@session.lock_wait_timeout -1 +0 SET @@session.lock_wait_timeout = 31537000; Warnings: Warning 1292 Truncated incorrect lock_wait_timeout value: '31537000' @@ -137,11 +133,9 @@ SELECT @@global.lock_wait_timeout; @@global.lock_wait_timeout 1 SET @@global.lock_wait_timeout = FALSE; -Warnings: -Warning 1292 Truncated incorrect lock_wait_timeout value: '0' SELECT @@global.lock_wait_timeout; @@global.lock_wait_timeout -1 +0 '#---------------------FN_DYNVARS_001_09----------------------#' SET @@global.lock_wait_timeout = 10; SET @@session.lock_wait_timeout = 11; diff --git a/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result b/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result index 7162e40ef6b..78ca8ca4ad1 100644 --- a/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result +++ b/mysql-test/suite/sys_vars/r/session_track_system_variables_basic.result @@ -5,25 +5,25 @@ # Global - default SELECT @@global.session_track_system_variables; @@global.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone # Session - default SELECT @@session.session_track_system_variables; @@session.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone # via INFORMATION_SCHEMA.GLOBAL_VARIABLES SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME; VARIABLE_NAME VARIABLE_VALUE SESSION_TRACK_SCHEMA ON SESSION_TRACK_STATE_CHANGE OFF -SESSION_TRACK_SYSTEM_VARIABLES +SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,time_zone SESSION_TRACK_TRANSACTION_INFO OFF # via INFORMATION_SCHEMA.SESSION_VARIABLES SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'session_track%' ORDER BY VARIABLE_NAME; VARIABLE_NAME VARIABLE_VALUE SESSION_TRACK_SCHEMA ON SESSION_TRACK_STATE_CHANGE OFF -SESSION_TRACK_SYSTEM_VARIABLES +SESSION_TRACK_SYSTEM_VARIABLES autocommit,character_set_client,character_set_connection,character_set_results,time_zone SESSION_TRACK_TRANSACTION_INFO OFF SET @global_saved_tmp = @@global.session_track_system_variables; @@ -34,7 +34,7 @@ SELECT @@global.session_track_system_variables; autocommit SELECT @@session.session_track_system_variables; @@session.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone # Altering session variable's value SET @@session.session_track_system_variables='autocommit'; @@ -72,25 +72,25 @@ SET @@session.session_track_system_variables = DEFAULT; SELECT @@global.session_track_system_variables; @@global.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone SELECT @@session.session_track_system_variables; @@session.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone # Variables' values in a new session (con2). connect con2,"127.0.0.1",root,,test,$MASTER_MYPORT,; SELECT @@global.session_track_system_variables; @@global.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone SELECT @@session.session_track_system_variables; @@session.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone # Altering session should not affect global. SET @@session.session_track_system_variables = 'sql_mode'; SELECT @@global.session_track_system_variables; @@global.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone SELECT @@session.session_track_system_variables; @@session.session_track_system_variables sql_mode @@ -104,7 +104,7 @@ SELECT @@global.session_track_system_variables; sql_mode SELECT @@session.session_track_system_variables; @@session.session_track_system_variables - +autocommit,character_set_client,character_set_connection,character_set_results,time_zone # Switching to the default connection. connection default; 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 b7025bcd606..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 ON - 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,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff index 44bb824432b..b31d1315779 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff @@ -6,19 +6,10 @@ VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT It is an alias for innodb_adaptive_hash_index_parts; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 1 - NUMERIC_MAX_VALUE 512 -@@ -68,7 +68,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 8 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Number of InnoDB Adaptive Hash Index Partitions (default 8) NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 512 -@@ -82,7 +82,7 @@ +@@ -68,7 +68,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 150000 VARIABLE_SCOPE GLOBAL @@ -27,7 +18,7 @@ VARIABLE_COMMENT The upper limit of the sleep delay in usec. Value of 0 disables it. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000000 -@@ -96,7 +96,7 @@ +@@ -82,7 +82,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 64 VARIABLE_SCOPE GLOBAL @@ -36,7 +27,7 @@ VARIABLE_COMMENT Data file autoextend increment in megabytes NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1000 -@@ -110,7 +110,7 @@ +@@ -96,7 +96,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -45,7 +36,7 @@ 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 -@@ -194,10 +194,10 @@ +@@ -180,10 +180,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 134217728 VARIABLE_SCOPE GLOBAL @@ -58,7 +49,7 @@ NUMERIC_BLOCK_SIZE 1048576 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -236,7 +236,7 @@ +@@ -222,7 +222,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 25 VARIABLE_SCOPE GLOBAL @@ -67,7 +58,7 @@ VARIABLE_COMMENT Dump only the hottest N% of each buffer pool, defaults to 25 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -278,7 +278,7 @@ +@@ -264,7 +264,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -76,7 +67,7 @@ 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 -@@ -362,7 +362,7 @@ +@@ -334,7 +334,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -85,68 +76,7 @@ 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 -@@ -474,10 +474,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -488,7 +488,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 100 -@@ -502,10 +502,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -530,10 +530,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -544,10 +544,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -572,7 +572,7 @@ +@@ -446,7 +446,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -155,7 +85,7 @@ VARIABLE_COMMENT Helps in performance tuning in heavily concurrent environments. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1000 -@@ -614,7 +614,7 @@ +@@ -488,7 +488,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 5 VARIABLE_SCOPE GLOBAL @@ -164,7 +94,7 @@ 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 -@@ -642,7 +642,7 @@ +@@ -516,7 +516,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 50 VARIABLE_SCOPE GLOBAL @@ -173,7 +103,7 @@ 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 -@@ -656,10 +656,10 @@ +@@ -530,10 +530,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 5000 VARIABLE_SCOPE GLOBAL @@ -186,7 +116,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -936,7 +936,7 @@ +@@ -796,7 +796,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 120 VARIABLE_SCOPE GLOBAL @@ -195,7 +125,7 @@ VARIABLE_COMMENT Number of pages reserved in doublewrite buffer for batch flushing NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 127 -@@ -1062,7 +1062,7 @@ +@@ -894,7 +894,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 600 VARIABLE_SCOPE GLOBAL @@ -204,7 +134,7 @@ VARIABLE_COMMENT Maximum number of seconds that semaphore times out in InnoDB. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 4294967295 -@@ -1132,7 +1132,7 @@ +@@ -922,7 +922,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -213,7 +143,7 @@ VARIABLE_COMMENT Percentage of B-tree page filled during bulk insert NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 100 -@@ -1146,7 +1146,7 @@ +@@ -936,7 +936,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -222,7 +152,7 @@ VARIABLE_COMMENT Make the first page of the given tablespace dirty. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -1160,7 +1160,7 @@ +@@ -950,7 +950,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 30 VARIABLE_SCOPE GLOBAL @@ -231,7 +161,7 @@ VARIABLE_COMMENT Number of iterations over which the background flushing is averaged. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1000 -@@ -1188,7 +1188,7 @@ +@@ -978,7 +978,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -240,7 +170,7 @@ 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 -@@ -1216,7 +1216,7 @@ +@@ -1006,7 +1006,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -249,7 +179,7 @@ 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 -@@ -1272,7 +1272,7 @@ +@@ -1062,7 +1062,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -258,7 +188,7 @@ 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 -@@ -1314,7 +1314,7 @@ +@@ -1090,7 +1090,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8000000 VARIABLE_SCOPE GLOBAL @@ -267,7 +197,7 @@ VARIABLE_COMMENT InnoDB Fulltext search cache size in bytes NUMERIC_MIN_VALUE 1600000 NUMERIC_MAX_VALUE 80000000 -@@ -1356,7 +1356,7 @@ +@@ -1132,7 +1132,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 84 VARIABLE_SCOPE GLOBAL @@ -276,7 +206,7 @@ VARIABLE_COMMENT InnoDB Fulltext search maximum token size in characters NUMERIC_MIN_VALUE 10 NUMERIC_MAX_VALUE 84 -@@ -1370,7 +1370,7 @@ +@@ -1146,7 +1146,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 3 VARIABLE_SCOPE GLOBAL @@ -285,7 +215,7 @@ VARIABLE_COMMENT InnoDB Fulltext search minimum token size in characters NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 16 -@@ -1384,7 +1384,7 @@ +@@ -1160,7 +1160,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2000 VARIABLE_SCOPE GLOBAL @@ -294,7 +224,7 @@ VARIABLE_COMMENT InnoDB Fulltext search number of words to optimize for each optimize table call NUMERIC_MIN_VALUE 1000 NUMERIC_MAX_VALUE 10000 -@@ -1398,7 +1398,7 @@ +@@ -1174,7 +1174,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2000000000 VARIABLE_SCOPE GLOBAL @@ -303,7 +233,7 @@ VARIABLE_COMMENT InnoDB Fulltext search query result cache limit in bytes NUMERIC_MIN_VALUE 1000000 NUMERIC_MAX_VALUE 4294967295 -@@ -1426,7 +1426,7 @@ +@@ -1202,7 +1202,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 2 VARIABLE_SCOPE GLOBAL @@ -312,7 +242,7 @@ 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 -@@ -1440,7 +1440,7 @@ +@@ -1216,7 +1216,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 640000000 VARIABLE_SCOPE GLOBAL @@ -321,7 +251,7 @@ VARIABLE_COMMENT Total memory allocated for InnoDB Fulltext Search cache NUMERIC_MIN_VALUE 32000000 NUMERIC_MAX_VALUE 1600000000 -@@ -1468,7 +1468,7 @@ +@@ -1244,7 +1244,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 100 VARIABLE_SCOPE GLOBAL @@ -330,7 +260,7 @@ 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 -@@ -1510,10 +1510,10 @@ +@@ -1272,10 +1272,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 200 VARIABLE_SCOPE GLOBAL @@ -343,7 +273,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1522,12 +1522,12 @@ +@@ -1284,12 +1284,12 @@ SESSION_VALUE NULL GLOBAL_VALUE 2000 GLOBAL_VALUE_ORIGIN COMPILE-TIME @@ -359,47 +289,16 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1541,7 +1541,7 @@ - VARIABLE_TYPE BIGINT - VARIABLE_COMMENT No effect for this build. - NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 9223372036854775807 -+NUMERIC_MAX_VALUE 2147483647 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -1622,7 +1622,7 @@ +@@ -1342,7 +1342,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 -@@ -1664,10 +1664,10 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. NUMERIC_MIN_VALUE 0 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 0 - ENUM_VALUE_LIST NULL - READ_ONLY NO -@@ -1678,7 +1678,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 65536 -@@ -1692,10 +1692,10 @@ + NUMERIC_MAX_VALUE 1073741824 +@@ -1356,10 +1356,10 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 16777216 VARIABLE_SCOPE GLOBAL @@ -412,7 +311,7 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -1762,7 +1762,7 @@ +@@ -1412,7 +1412,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 2 VARIABLE_SCOPE GLOBAL @@ -421,7 +320,7 @@ VARIABLE_COMMENT Number of log files in the log group. InnoDB writes to the files in a circular fashion. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 -@@ -1804,7 +1804,7 @@ +@@ -1454,7 +1454,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8192 VARIABLE_SCOPE GLOBAL @@ -430,7 +329,7 @@ VARIABLE_COMMENT Redo log write ahead unit size to avoid read-on-write, it should match the OS cache block IO size NUMERIC_MIN_VALUE 512 NUMERIC_MAX_VALUE 16384 -@@ -1818,10 +1818,10 @@ +@@ -1468,10 +1468,10 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 1024 VARIABLE_SCOPE GLOBAL @@ -443,7 +342,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1902,10 +1902,10 @@ +@@ -1524,10 +1524,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -456,7 +355,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -1916,7 +1916,7 @@ +@@ -1538,7 +1538,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -465,16 +364,7 @@ VARIABLE_COMMENT Maximum delay of user threads in micro-seconds NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 10000000 -@@ -1958,7 +1958,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 10 -@@ -2028,7 +2028,7 @@ +@@ -1636,7 +1636,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 8 VARIABLE_SCOPE GLOBAL @@ -483,7 +373,7 @@ VARIABLE_COMMENT Number of multi-threaded flush threads NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 64 -@@ -2084,10 +2084,10 @@ +@@ -1692,10 +1692,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -496,7 +386,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES -@@ -2112,7 +2112,7 @@ +@@ -1720,7 +1720,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL @@ -505,7 +395,7 @@ VARIABLE_COMMENT Page cleaner threads can be from 1 to 64. Default is 4. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 64 -@@ -2140,7 +2140,7 @@ +@@ -1748,7 +1748,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16 VARIABLE_SCOPE GLOBAL @@ -514,7 +404,7 @@ 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 -@@ -2154,7 +2154,7 @@ +@@ -1762,7 +1762,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 16384 VARIABLE_SCOPE GLOBAL @@ -523,7 +413,7 @@ VARIABLE_COMMENT Page size to use for all InnoDB tablespaces. NUMERIC_MIN_VALUE 4096 NUMERIC_MAX_VALUE 65536 -@@ -2252,7 +2252,7 @@ +@@ -1804,7 +1804,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 300 VARIABLE_SCOPE GLOBAL @@ -532,7 +422,7 @@ VARIABLE_COMMENT Number of UNDO log pages to purge in one batch from the history list. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 5000 -@@ -2266,7 +2266,7 @@ +@@ -1818,7 +1818,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 128 VARIABLE_SCOPE GLOBAL @@ -541,7 +431,7 @@ VARIABLE_COMMENT Dictates rate at which UNDO records are purged. Value N means purge rollback segment(s) on every Nth iteration of purge invocation NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -2308,7 +2308,7 @@ +@@ -1860,7 +1860,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL @@ -550,7 +440,7 @@ VARIABLE_COMMENT Purge threads can be from 1 to 32. Default is 4. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 32 -@@ -2336,7 +2336,7 @@ +@@ -1888,7 +1888,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 56 VARIABLE_SCOPE GLOBAL @@ -559,7 +449,7 @@ VARIABLE_COMMENT Number of pages that must be accessed sequentially for InnoDB to trigger a readahead. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 64 -@@ -2350,7 +2350,7 @@ +@@ -1902,7 +1902,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL @@ -568,7 +458,7 @@ VARIABLE_COMMENT Number of background read I/O threads in InnoDB. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 64 -@@ -2378,10 +2378,10 @@ +@@ -1930,10 +1930,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -581,7 +471,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2406,7 +2406,7 @@ +@@ -1958,7 +1958,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 128 VARIABLE_SCOPE GLOBAL @@ -590,7 +480,7 @@ VARIABLE_COMMENT Number of undo logs to use (deprecated). NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -2420,7 +2420,7 @@ +@@ -1972,7 +1972,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -599,52 +489,7 @@ VARIABLE_COMMENT An InnoDB page number. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 -@@ -2434,7 +2434,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 39 -@@ -2448,7 +2448,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 39 -@@ -2462,7 +2462,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 39 -@@ -2504,7 +2504,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1000 -@@ -2518,7 +2518,7 @@ - GLOBAL_VALUE_ORIGIN COMPILE-TIME - DEFAULT_VALUE 0 - VARIABLE_SCOPE GLOBAL --VARIABLE_TYPE BIGINT UNSIGNED -+VARIABLE_TYPE INT UNSIGNED - VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. - NUMERIC_MIN_VALUE 0 - NUMERIC_MAX_VALUE 1 -@@ -2546,7 +2546,7 @@ +@@ -2028,7 +2028,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -653,7 +498,7 @@ VARIABLE_COMMENT Memory buffer size for index creation NUMERIC_MIN_VALUE 65536 NUMERIC_MAX_VALUE 67108864 -@@ -2770,7 +2770,7 @@ +@@ -2238,7 +2238,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL @@ -662,7 +507,7 @@ VARIABLE_COMMENT Size of the mutex/lock wait array. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 1024 -@@ -2798,10 +2798,10 @@ +@@ -2266,10 +2266,10 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 30 VARIABLE_SCOPE GLOBAL @@ -675,7 +520,7 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO -@@ -2840,7 +2840,7 @@ +@@ -2308,7 +2308,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -684,7 +529,7 @@ 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 -@@ -2854,7 +2854,7 @@ +@@ -2322,7 +2322,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 10000 VARIABLE_SCOPE GLOBAL @@ -693,7 +538,7 @@ 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 -@@ -2952,7 +2952,7 @@ +@@ -2392,7 +2392,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 128 VARIABLE_SCOPE GLOBAL @@ -702,7 +547,7 @@ VARIABLE_COMMENT Number of undo logs to use. NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 128 -@@ -2980,7 +2980,7 @@ +@@ -2420,7 +2420,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE GLOBAL @@ -711,7 +556,7 @@ VARIABLE_COMMENT Number of undo tablespaces to use. NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 127 -@@ -3092,7 +3092,7 @@ +@@ -2476,7 +2476,7 @@ GLOBAL_VALUE_ORIGIN CONFIG DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL 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 af8777c4f4b..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 ON -@@ -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/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 7402b84dc96..afdf85b15e1 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -48,20 +48,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS -SESSION_VALUE NULL -GLOBAL_VALUE 8 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 8 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT It is an alias for innodb_adaptive_hash_index_parts; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE 1 -NUMERIC_MAX_VALUE 512 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_ADAPTIVE_HASH_INDEX_PARTS SESSION_VALUE NULL GLOBAL_VALUE 8 @@ -328,20 +314,6 @@ NUMERIC_BLOCK_SIZE NULL 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 and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -454,104 +426,6 @@ 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_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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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_FREE_LIST_LWM -SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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_LSN_AGE_FACTOR -SESSION_VALUE NULL -GLOBAL_VALUE DEPRECATED -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE DEPRECATED -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST LEGACY,HIGH_CHECKPOINT,DEPRECATED -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_CLEANER_MAX_FLUSH_TIME -SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -664,20 +538,6 @@ 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 deprecated -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE deprecated -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST assert,warn,salvage,deprecated -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_DATA_FILE_PATH SESSION_VALUE NULL GLOBAL_VALUE ibdata1:12M:autoextend @@ -944,20 +804,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_EMPTY_FREE_LIST_ALGORITHM -SESSION_VALUE NULL -GLOBAL_VALUE DEPRECATED -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE DEPRECATED -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST LEGACY,BACKOFF,DEPRECATED -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_ENCRYPTION_ROTATE_KEY_AGE SESSION_VALUE NULL GLOBAL_VALUE 1 @@ -1028,20 +874,6 @@ NUMERIC_BLOCK_SIZE NULL 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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -1070,48 +902,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_FILE_FORMAT -SESSION_VALUE NULL -GLOBAL_VALUE Barracuda -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE Barracuda -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT File format to use for new tables in .ibd files. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_FILE_FORMAT_CHECK -SESSION_VALUE NULL -GLOBAL_VALUE ON -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE ON -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Whether to perform system file format check. -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_FILE_FORMAT_MAX -SESSION_VALUE NULL -GLOBAL_VALUE Barracuda -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE Antelope -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT The highest file format in the tablespace. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_FILE_PER_TABLE SESSION_VALUE NULL GLOBAL_VALUE ON @@ -1280,20 +1070,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_FOREGROUND_PREFLUSH -SESSION_VALUE NULL -GLOBAL_VALUE DEPRECATED -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE DEPRECATED -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST SYNC_PREFLUSH,EXPONENTIAL_BACKOFF,DEPRECATED -READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_FT_AUX_TABLE SESSION_VALUE NULL GLOBAL_VALUE @@ -1490,20 +1266,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_INSTRUMENT_SEMAPHORES -SESSION_VALUE NULL -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT DEPRECATED. This setting has no effect. -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_IO_CAPACITY SESSION_VALUE NULL GLOBAL_VALUE 200 @@ -1532,34 +1294,6 @@ 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 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 ON -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE ON -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Support large index prefix length of REC_VERSION_56_MAX_INDEX_COL_LEN (3072) bytes. -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_LIMIT_OPTIMISTIC_INSERT_DEBUG SESSION_VALUE NULL GLOBAL_VALUE 0 @@ -1574,20 +1308,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_LOCKING_FAKE_CHANGES -SESSION_VALUE NULL -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -1624,67 +1344,11 @@ DEFAULT_VALUE 50 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT 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 -NUMERIC_BLOCK_SIZE 0 -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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 1073741824 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 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE 0 -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 @@ -1728,20 +1392,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_LOG_CHECKSUM_ALGORITHM -SESSION_VALUE NULL -GLOBAL_VALUE DEPRECATED -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE DEPRECATED -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE ENUM -VARIABLE_COMMENT Deprecated and translated to innodb_log_checksums (NONE to OFF, everything else to ON); only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE NULL -NUMERIC_MAX_VALUE NULL -NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE,DEPRECATED -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES SESSION_VALUE NULL GLOBAL_VALUE ON @@ -1840,34 +1490,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_MAX_BITMAP_FILE_SIZE -SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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_CHANGED_PAGES -SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -1952,20 +1574,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED -VARIABLE_NAME INNODB_MIRRORED_LOG_GROUPS -SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 10 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY YES -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_MONITOR_DISABLE SESSION_VALUE NULL GLOBAL_VALUE @@ -2190,62 +1798,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON 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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -2428,48 +1980,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_SCHED_PRIORITY_IO -SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -2498,34 +2008,6 @@ NUMERIC_BLOCK_SIZE 0 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_SHOW_LOCKS_HELD -SESSION_VALUE NULL -GLOBAL_VALUE 0 -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 1 -NUMERIC_BLOCK_SIZE 0 -ENUM_VALUE_LIST NULL -READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_SIMULATE_COMP_FAILURES SESSION_VALUE NULL GLOBAL_VALUE 0 @@ -2750,20 +2232,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME INNODB_SUPPORT_XA -SESSION_VALUE ON -GLOBAL_VALUE ON -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE ON -VARIABLE_SCOPE SESSION -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Enable InnoDB support for the XA two-phase commit -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_SYNC_ARRAY_SIZE SESSION_VALUE NULL GLOBAL_VALUE 1 @@ -2876,34 +2344,6 @@ NUMERIC_BLOCK_SIZE NULL 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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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_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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -2995,41 +2435,13 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Enable atomic writes, instead of using the doublewrite buffer, for files on devices that supports atomic writes. To use this option one must use file_per_table=1, flush_method=O_DIRECT and use_fallocate=1. This option only works on Linux with either FusionIO cards using the directFS filesystem or with Shannon cards using any file system. -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_FALLOCATE -SESSION_VALUE NULL -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Use posix_fallocate() to allocate files. DEPRECATED, has no effect. +VARIABLE_COMMENT Enable atomic writes, instead of using the doublewrite buffer, for files on devices that supports atomic writes. To use this option one must use innodb_file_per_table=1, innodb_flush_method=O_DIRECT. This option only works on Linux with either FusionIO cards using the directFS filesystem or with Shannon cards using any file system. 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_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT -SESSION_VALUE NULL -GLOBAL_VALUE OFF -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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 @@ -3044,34 +2456,6 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON 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 Deprecated and ignored; only exists to allow easier upgrade from earlier XtraDB versions. -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_TRIM -SESSION_VALUE NULL -GLOBAL_VALUE ON -GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE ON -VARIABLE_SCOPE GLOBAL -VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Deallocate (punch_hole|trim) unused portions of the page compressed page (on by default) -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_VERSION SESSION_VALUE NULL GLOBAL_VALUE 5.7.18 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index fa09c33cc9a..0a98a099f23 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -1213,6 +1213,48 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL +VARIABLE_NAME IDLE_READONLY_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for read-only idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IDLE_READWRITE_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for read-write idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IDLE_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME IGNORE_BUILTIN_INNODB SESSION_VALUE NULL GLOBAL_VALUE OFF @@ -1599,7 +1641,7 @@ DEFAULT_VALUE 86400 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. -NUMERIC_MIN_VALUE 1 +NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index af17ac34b61..6c8817cf10b 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -1115,6 +1115,20 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL +VARIABLE_NAME GTID_POS_AUTO_ENGINES +SESSION_VALUE NULL +GLOBAL_VALUE +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE VARCHAR +VARIABLE_COMMENT List of engines for which to automatically create a mysql.gtid_slave_pos_ENGINE table, if a transaction using that engine is replicated. This can be used to avoid introducing cross-engine transactions, if engines are used different from that used by table mysql.gtid_slave_pos +NUMERIC_MIN_VALUE NULL +NUMERIC_MAX_VALUE NULL +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME GTID_SEQ_NO SESSION_VALUE 0 GLOBAL_VALUE NULL @@ -1325,6 +1339,48 @@ NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT NULL +VARIABLE_NAME IDLE_READONLY_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for read-only idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IDLE_READWRITE_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for read-write idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME IDLE_TRANSACTION_TIMEOUT +SESSION_VALUE 0 +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE SESSION +VARIABLE_TYPE INT UNSIGNED +VARIABLE_COMMENT The number of seconds the server waits for idle transaction +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 31536000 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME IGNORE_BUILTIN_INNODB SESSION_VALUE NULL GLOBAL_VALUE OFF @@ -1725,7 +1781,7 @@ DEFAULT_VALUE 86400 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Timeout in seconds to wait for a lock before returning an error. -NUMERIC_MIN_VALUE 1 +NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 31536000 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL @@ -3888,13 +3944,13 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SESSION_TRACK_SYSTEM_VARIABLES -SESSION_VALUE -GLOBAL_VALUE +SESSION_VALUE autocommit,character_set_client,character_set_connection,character_set_results,time_zone +GLOBAL_VALUE autocommit,character_set_client,character_set_connection,character_set_results,time_zone GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE +DEFAULT_VALUE autocommit,character_set_client,character_set_connection,character_set_results,time_zone VARIABLE_SCOPE SESSION VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Track changes in registered system variables. For compatibility with MySQL defaults this variable should be set to "autocommit, character_set_client, character_set_connection, character_set_results, time_zone" +VARIABLE_COMMENT Track changes in registered system variables. 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_file_format_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_format_basic.test deleted file mode 100644 index 739260c07e5..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_file_format_basic.test +++ /dev/null @@ -1,61 +0,0 @@ - - -# 2010-01-25 - Added -# - ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_file_format; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are 'Antelope' and 'Barracuda' -select @@global.innodb_file_format in ('Antelope', 'Barracuda'); -select @@global.innodb_file_format; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_file_format; -show global variables like 'innodb_file_format'; -show session variables like 'innodb_file_format'; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_file_format'; -select * from information_schema.session_variables where variable_name='innodb_file_format'; ---enable_warnings - -# -# show that it's writable -# -set global innodb_file_format='Antelope'; -select @@global.innodb_file_format; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_file_format'; -select * from information_schema.session_variables where variable_name='innodb_file_format'; ---enable_warnings -set @@global.innodb_file_format='Barracuda'; -select @@global.innodb_file_format; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_file_format'; -select * from information_schema.session_variables where variable_name='innodb_file_format'; ---enable_warnings ---error ER_GLOBAL_VARIABLE -set session innodb_file_format='Salmon'; ---error ER_GLOBAL_VARIABLE -set @@session.innodb_file_format='Salmon'; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_file_format=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_file_format=1e1; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_file_format='Salmon'; - -# -# Cleanup -# - -SET @@global.innodb_file_format = @start_global_value; -SELECT @@global.innodb_file_format; diff --git a/mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test deleted file mode 100644 index 56afba48e29..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test +++ /dev/null @@ -1,101 +0,0 @@ -# -# 2011-08-02 - Added -# - ---source include/not_embedded.inc ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_file_format_check; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are 'ON' and 'OFF' -SELECT @@global.innodb_file_format_check in (0, 1); -SELECT @@global.innodb_file_format_check; - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.innodb_file_format_check; -SHOW global variables LIKE 'innodb_file_format_check'; -SHOW session variables LIKE 'innodb_file_format_check'; ---disable_warnings -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_check'; -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_check'; ---enable_warnings - -# -# show that it's read only -# - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@global.innodb_file_format_check='Off'; ---echo Expected error 'Read only variable' - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@global.innodb_file_format_check=1; ---echo Expected error 'Read only variable' - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@global.innodb_file_format_check=0; ---echo Expected error 'Read only variable' - ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SET @@global.innodb_file_format_check='On'; ---echo Expected error 'Read only variable' - ---error ER_GLOBAL_VARIABLE -SET session innodb_large_prefix='OFF'; ---error ER_GLOBAL_VARIABLE -SET @@session.innodb_stats_on_metadata='ON'; - -# -# Check if the value in GLOBAL Table matches value in variable -# - ---disable_warnings -SELECT IF(@@GLOBAL.innodb_file_format_check, "ON", "OFF") = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_format_check'; ---enable_warnings ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_file_format_check); ---echo 1 Expected - ---disable_warnings -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_file_format_check'; ---enable_warnings ---echo 1 Expected - -# -# Check if accessing variable with and without GLOBAL point to same variable -# -SELECT @@innodb_file_format_check = @@GLOBAL.innodb_file_format_check; ---echo 1 Expected - -# -# Check if innodb_doublewrite can be accessed with and without @@ sign -# - -SELECT COUNT(@@innodb_file_format_check); ---echo 1 Expected - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@local.innodb_file_format_check); ---echo Expected error 'Variable is a GLOBAL variable' - ---Error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT COUNT(@@SESSION.innodb_file_format_check); ---echo Expected error 'Variable is a GLOBAL variable' - -SELECT COUNT(@@GLOBAL.innodb_file_format_check); ---echo 1 Expected - ---Error ER_BAD_FIELD_ERROR -SELECT innodb_file_format_check = @@SESSION.innodb_file_format_check; ---echo Expected error 'Readonly variable' diff --git a/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test b/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test deleted file mode 100644 index 494f3817cb8..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_file_format_max_basic.test +++ /dev/null @@ -1,66 +0,0 @@ -# -# 2011-08-02 - Added -# ---source include/not_embedded.inc ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_file_format_max; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are 'Antelope' and 'Barracuda' -SELECT @@global.innodb_file_format_max in ('Antelope', 'Barracuda'); -SELECT @@global.innodb_file_format_max; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.innodb_file_format_max; -SHOW global variables LIKE 'innodb_file_format_max'; -SHOW session variables LIKE 'innodb_file_format_max'; ---disable_warnings -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_max'; -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_max'; ---enable_warnings - -# -# show that it's writable -# -SET global innodb_file_format_max='Antelope'; -SELECT @@global.innodb_file_format_max; ---disable_warnings -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_max'; -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_max'; ---enable_warnings -SET @@global.innodb_file_format_max='Barracuda'; -SELECT @@global.innodb_file_format_max; ---disable_warnings -SELECT * FROM information_schema.global_variables -WHERE variable_name='innodb_file_format_max'; -SELECT * FROM information_schema.session_variables -WHERE variable_name='innodb_file_format_max'; ---enable_warnings ---error ER_GLOBAL_VARIABLE -SET session innodb_file_format_max='Salmon'; ---error ER_GLOBAL_VARIABLE -SET @@session.innodb_file_format_max='Salmon'; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -SET global innodb_file_format_max=1.1; ---error ER_WRONG_TYPE_FOR_VAR -SET global innodb_file_format_max=1e1; ---error ER_WRONG_VALUE_FOR_VAR -SET global innodb_file_format_max='Salmon'; - -# -# Cleanup -# - -SET @@global.innodb_file_format_max = @start_global_value; -SELECT @@global.innodb_file_format_max; 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_instrument_semaphores_basic.test b/mysql-test/suite/sys_vars/t/innodb_instrument_semaphores_basic.test deleted file mode 100644 index 9b302be79b5..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_instrument_semaphores_basic.test +++ /dev/null @@ -1,42 +0,0 @@ ---source include/have_innodb.inc - ---echo # ---echo # innodb_instrument_semaphores ---echo # - ---echo # save the initial value -SET @innodb_instrument_semaphores_global_saved = @@global.innodb_instrument_semaphores; - ---echo # default -SELECT @@global.innodb_instrument_semaphores; - ---echo ---echo # scope ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -SELECT @@session.innodb_instrument_semaphores; -SET @@global.innodb_instrument_semaphores=OFF; -SELECT @@global.innodb_instrument_semaphores; -SET @@global.innodb_instrument_semaphores=ON; -SELECT @@global.innodb_instrument_semaphores; - ---echo ---echo # valid values -SET @@global.innodb_instrument_semaphores='OFF'; -SELECT @@global.innodb_instrument_semaphores; -SET @@global.innodb_instrument_semaphores=ON; -SELECT @@global.innodb_instrument_semaphores; -SET @@global.innodb_instrument_semaphores=default; -SELECT @@global.innodb_instrument_semaphores; - ---echo ---echo # invalid values ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_instrument_semaphores=NULL; ---error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_instrument_semaphores='junk'; - ---echo ---echo # restore the initial value -SET @@global.innodb_instrument_semaphores = @innodb_instrument_semaphores_global_saved; - ---echo # End of test 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_large_prefix_basic.test b/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test deleted file mode 100644 index 877fe17b003..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test +++ /dev/null @@ -1,82 +0,0 @@ - - -# 2010-01-25 - Added -# - ---source include/have_innodb.inc - -SET @start_global_value = @@global.innodb_large_prefix; -SELECT @start_global_value; - -# -# exists as global only -# ---echo Valid values are 'ON' and 'OFF' -select @@global.innodb_large_prefix in (0, 1); -select @@global.innodb_large_prefix; ---error ER_INCORRECT_GLOBAL_LOCAL_VAR -select @@session.innodb_large_prefix; -show global variables like 'innodb_large_prefix'; -show session variables like 'innodb_large_prefix'; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; ---enable_warnings - -# -# show that it's writable -# -set global innodb_large_prefix='OFF'; -select @@global.innodb_large_prefix; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; ---enable_warnings -set @@global.innodb_large_prefix=1; -select @@global.innodb_large_prefix; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; ---enable_warnings -set global innodb_large_prefix=0; -select @@global.innodb_large_prefix; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; ---enable_warnings -set @@global.innodb_large_prefix='ON'; -select @@global.innodb_large_prefix; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; ---enable_warnings ---error ER_GLOBAL_VARIABLE -set session innodb_large_prefix='OFF'; ---error ER_GLOBAL_VARIABLE -set @@session.innodb_large_prefix='ON'; - -# -# incorrect types -# ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_large_prefix=1.1; ---error ER_WRONG_TYPE_FOR_VAR -set global innodb_large_prefix=1e1; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_large_prefix=2; ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_large_prefix=-3; -select @@global.innodb_large_prefix; ---disable_warnings -select * from information_schema.global_variables where variable_name='innodb_large_prefix'; -select * from information_schema.session_variables where variable_name='innodb_large_prefix'; ---enable_warnings ---error ER_WRONG_VALUE_FOR_VAR -set global innodb_large_prefix='AUTO'; - -# -# Cleanup -# - -SET @@global.innodb_large_prefix = @start_global_value; -SELECT @@global.innodb_large_prefix; 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_support_xa_basic.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test deleted file mode 100644 index 30f3b0ef46b..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test +++ /dev/null @@ -1,240 +0,0 @@ -################# mysql-test\t\innodb_support_xa_basic.test ################### -# # -# Variable Name: innodb_support_xa # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: boolean # -# Default Value: 1 # -# Range: 0,1 # -# # -# # -# Creation Date: 2008-02-20 # -# Author: Rizwan # -# # -# Description: Test Cases of Dynamic System Variable innodb_support_xa # -# that checks the behavior of this variable in the following ways# -# * Default Value # -# * Valid & Invalid values # -# * Scope & Access method # -# * Data Integrity # -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc ---source include/load_sysvars.inc - -######################################################################## -# START OF innodb_support_xa TESTS # -######################################################################## - - -################################################################################ -# Saving initial value of innodb_support_xa in a temporary variable # -################################################################################ - - -SET @session_start_value = @@session.innodb_support_xa; -SELECT @session_start_value; - - -SET @global_start_value = @@global.innodb_support_xa; -SELECT @global_start_value; - - - ---echo '#--------------------FN_DYNVARS_046_01------------------------#' -######################################################################## -# Display the DEFAULT value of innodb_support_xa # -######################################################################## - -SET @@session.innodb_support_xa = 0; -SET @@session.innodb_support_xa = DEFAULT; -SELECT @@session.innodb_support_xa; - -SET @@global.innodb_support_xa = 0; -SET @@global.innodb_support_xa = DEFAULT; -SELECT @@global.innodb_support_xa; - ---echo '#---------------------FN_DYNVARS_046_02-------------------------#' -########################################################################## -# Check if innodb_support_xa can be accessed with and without @@ sign # -########################################################################## - -SET innodb_support_xa = 1; -SELECT @@innodb_support_xa; - ---Error ER_UNKNOWN_TABLE -SELECT session.innodb_support_xa; - ---Error ER_UNKNOWN_TABLE -SELECT local.innodb_support_xa; - ---Error ER_UNKNOWN_TABLE -SELECT global.innodb_support_xa; -#using another syntax for accessing system variables -SET session innodb_support_xa = 0; -SELECT @@session.innodb_support_xa; - -SET global innodb_support_xa = 0; -SELECT @@global.innodb_support_xa; - - ---echo '#--------------------FN_DYNVARS_046_03------------------------#' -########################################################################## -# change the value of innodb_support_xa to a valid value # -########################################################################## -# for session -SET @@session.innodb_support_xa = 0; -SELECT @@session.innodb_support_xa; -SET @@session.innodb_support_xa = 1; -SELECT @@session.innodb_support_xa; - -# for global -SET @@global.innodb_support_xa = 0; -SELECT @@global.innodb_support_xa; -SET @@global.innodb_support_xa = 1; -SELECT @@global.innodb_support_xa; - - ---echo '#--------------------FN_DYNVARS_046_04-------------------------#' -########################################################################### -# Change the value of innodb_support_xa to invalid value # -########################################################################### - -# for session ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.innodb_support_xa = -0.6; ---Error ER_WRONG_TYPE_FOR_VAR -SET @@session.innodb_support_xa = 1.6; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.innodb_support_xa = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.innodb_support_xa = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.innodb_support_xa = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.innodb_support_xa = ÕN; - -SET @@session.innodb_support_xa = OF; -SELECT @@session.innodb_support_xa; - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@session.innodb_support_xa = ÓFF; - -# for global - - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_support_xa = -1; -SELECT @@global.innodb_support_xa; - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_support_xa = 2; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_support_xa = "T"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_support_xa = "Y"; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_support_xa = TRÜE; ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_support_xa = ÕN; - -SET @@global.innodb_support_xa = OF; -SELECT @@global.innodb_support_xa; - ---Error ER_WRONG_VALUE_FOR_VAR -SET @@global.innodb_support_xa = ÓFF; - - ---echo '#-------------------FN_DYNVARS_046_05----------------------------#' -########################################################################### -# Test if changing global variable effects session and vice versa # -########################################################################### - -SET @@global.innodb_support_xa = 0; -SET @@session.innodb_support_xa = 1; -SELECT @@global.innodb_support_xa AS res_is_0; - -SET @@global.innodb_support_xa = 0; -SELECT @@session.innodb_support_xa AS res_is_1; - ---echo '#----------------------FN_DYNVARS_046_06------------------------#' -######################################################################### -# Check if the value in GLOBAL Table matches value in variable # -######################################################################### - ---disable_warnings -SELECT IF(@@global.innodb_support_xa, "ON", "OFF") = - VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_support_xa'; ---enable_warnings -SELECT @@global.innodb_support_xa; ---disable_warnings -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE VARIABLE_NAME='innodb_support_xa'; ---enable_warnings - - ---echo '#----------------------FN_DYNVARS_046_07------------------------#' -######################################################################### -# Check if the value in SESSION Table matches value in variable # -######################################################################### - ---disable_warnings -SELECT IF(@@session.innodb_support_xa, "ON", "OFF") = - VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES - WHERE VARIABLE_NAME='innodb_support_xa'; ---enable_warnings -SELECT @@session.innodb_support_xa; ---disable_warnings -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES - WHERE VARIABLE_NAME='innodb_support_xa'; ---enable_warnings - - ---echo '#---------------------FN_DYNVARS_046_08-------------------------#' -################################################################### -# Check if ON and OFF values can be used on variable # -################################################################### - -SET @@session.innodb_support_xa = OFF; -SELECT @@session.innodb_support_xa; -SET @@session.innodb_support_xa = ON; -SELECT @@session.innodb_support_xa; - -SET @@global.innodb_support_xa = OFF; -SELECT @@global.innodb_support_xa; -SET @@global.innodb_support_xa = ON; -SELECT @@global.innodb_support_xa; - ---echo '#---------------------FN_DYNVARS_046_09----------------------#' -################################################################### -# Check if TRUE and FALSE values can be used on variable # -################################################################### - -SET @@session.innodb_support_xa = TRUE; -SELECT @@session.innodb_support_xa; -SET @@session.innodb_support_xa = FALSE; -SELECT @@session.innodb_support_xa; - -SET @@global.innodb_support_xa = TRUE; -SELECT @@global.innodb_support_xa; -SET @@global.innodb_support_xa = FALSE; -SELECT @@global.innodb_support_xa; - -############################## -# Restore initial value # -############################## - -SET @@session.innodb_support_xa = @session_start_value; -SELECT @@session.innodb_support_xa; - -SET @@global.innodb_support_xa = @global_start_value; -SELECT @@global.innodb_support_xa; - -############################################################### -# END OF innodb_support_xa TESTS # -############################################################### diff --git a/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test b/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test deleted file mode 100644 index a6875ec780d..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test +++ /dev/null @@ -1,135 +0,0 @@ -################# mysql-test\t\innodb_support_xa_func.test ################### -# # -# Variable Name: innodb_support_xa # -# Scope: GLOBAL | SESSION # -# Access Type: Dynamic # -# Data Type: boolean # -# Default Value: 1 # -# Range: 0,1 # -# # -# # -# Creation Date: 2008-03-08 # -# Author: Rizwan # -# # -# Description: Test Cases of Dynamic System Variable innodb_support_xa # -# that checks the behavior of this variable in the following ways# -# # -# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # -# server-system-variables.html # -# # -############################################################################### - ---source include/have_innodb.inc ---source include/count_sessions.inc ---echo '#--------------------FN_DYNVARS_046_01-------------------------#' -#################################################################### -# Check if setting innodb_support_xa is changed in new connection # -#################################################################### - -SET @@global.innodb_support_xa = OFF; -connect (con1,localhost,root,,,,); -connection con1; -SELECT @@global.innodb_support_xa; -SELECT @@session.innodb_support_xa; -disconnect con1; - - ---echo '#--------------------FN_DYNVARS_046_01-------------------------#' -########################################################### -# Begin the functionality Testing of innodb_support_xa # -########################################################### - -connection default; -SET @@global.innodb_support_xa = 1; - ---disable_warnings -drop table if exists t1, t2; ---enable_warnings - -create table t1 (a int) engine=innodb; - -#==================================================== ---echo '---check when innodb_support_xa is 1---' -#==================================================== - - -SET @@innodb_support_xa = 1; - -xa start 'test1'; -INSERT t1 values (10); -xa end 'test1'; -xa prepare 'test1'; -xa rollback 'test1'; -SELECT * from t1; - -#==================================================== ---echo '---check when innodb_support_xa is 0---' -#==================================================== - -SET @@innodb_support_xa = 0; -# -xa start 'test1'; -INSERT t1 values (10); -xa end 'test1'; -xa prepare 'test1'; -xa rollback 'test1'; -SELECT * from t1; - -#==================================================== ---echo '------general xa testing--------' -#==================================================== - -SET @@global.innodb_support_xa = 1; -SET @@innodb_support_xa = 1; - -xa start 'testa','testb'; -INSERT t1 values (30); ---Error ER_XAER_RMFAIL -COMMIT; -xa end 'testa','testb'; ---Error ER_XAER_RMFAIL -BEGIN; ---Error ER_XAER_RMFAIL -CREATE table t2 (a int); -CONNECT (con1,localhost,root,,,,); -connection con1; - ---Error ER_XAER_DUPID -xa start 'testa','testb'; ---Error ER_XAER_DUPID -xa start 'testa','testb', 123; - -# gtrid [ , bqual [ , formatID ] ] -xa start 0x7465737462, 0x2030405060, 0xb; -INSERT t1 values (40); -xa end 'testb',' 0@P`',11; -xa prepare 'testb',0x2030405060,11; - ---Error ER_XAER_RMFAIL -START TRANSACTION; -xa recover; - -# uncomment the line below when binlog will be able to prepare -#disconnect con1; - -CONNECTION default; -xa prepare 'testa','testb'; -xa recover; ---Error ER_XAER_NOTA -xa commit 'testb',0x2030405060,11; -xa commit 'testa','testb'; - -CONNECTION con1; -xa rollback 'testb',0x2030405060,11; - -SELECT * from t1; - -disconnect con1; -connection default; -DROP table t1; ---source include/wait_until_count_sessions.inc - -######################################################## -# End of functionality Testing for innodb_support_xa # -######################################################## - 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/suite/sys_vars/t/innodb_use_trim_basic.test b/mysql-test/suite/sys_vars/t/innodb_use_trim_basic.test deleted file mode 100644 index c1b0f142179..00000000000 --- a/mysql-test/suite/sys_vars/t/innodb_use_trim_basic.test +++ /dev/null @@ -1,36 +0,0 @@ ---source include/have_innodb.inc - -SET @start_use_trim = @@global.innodb_use_trim; -SELECT @start_use_trim; - -SELECT COUNT(@@GLOBAL.innodb_use_trim); ---echo 1 Expected - -#################################################################### -# Check if Value can set # -#################################################################### - -SET @@GLOBAL.innodb_use_trim=1; - -SELECT COUNT(@@GLOBAL.innodb_use_trim); ---echo 1 Expected - -################################################################# -# Check if the value in GLOBAL Table matches value in variable # -################################################################# - -SELECT IF(@@GLOBAL.innodb_use_trim, 'ON', 'OFF') = VARIABLE_VALUE -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_trim'; ---echo 1 Expected - -SELECT COUNT(@@GLOBAL.innodb_use_trim); ---echo 1 Expected - -SELECT COUNT(VARIABLE_VALUE) -FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES -WHERE VARIABLE_NAME='innodb_use_trim'; ---echo 1 Expected - -SET @@global.innodb_use_trim = @start_use_trim; -SELECT @@global.innodb_use_trim;
\ No newline at end of file diff --git a/mysql-test/t/ctype_utf8mb4_innodb-master.opt b/mysql-test/t/ctype_utf8mb4_innodb-master.opt index 56d40323eae..96f0ce3f36c 100644 --- a/mysql-test/t/ctype_utf8mb4_innodb-master.opt +++ b/mysql-test/t/ctype_utf8mb4_innodb-master.opt @@ -1,2 +1 @@ --default-storage-engine=MyISAM ---loose-innodb-large-prefix=OFF 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/t/partition_innodb-master.opt b/mysql-test/t/partition_innodb-master.opt deleted file mode 100644 index cf94b2d7dca..00000000000 --- a/mysql-test/t/partition_innodb-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb-large-prefix=OFF diff --git a/mysql-test/t/timeout.test b/mysql-test/t/timeout.test new file mode 100644 index 00000000000..9f6e692b148 --- /dev/null +++ b/mysql-test/t/timeout.test @@ -0,0 +1,60 @@ +--echo # +--echo # MDEV-11379 - AliSQL: [Feature] Issue#8: SELECT FOR UPDATE WAIT +--echo # MDEV-11388 - AliSQL: [Feature] Issue#15 DDL FAST FAIL +--echo # +CREATE TABLE t1(a INT, b TEXT, c MULTIPOLYGON NOT NULL); +CREATE INDEX i1 ON t1(a) WAIT 1; +CREATE FULLTEXT INDEX i2 ON t1(b) WAIT 1; +CREATE SPATIAL INDEX i3 ON t1(c) WAIT 1; +ALTER TABLE t1 WAIT 1 COMMENT='test'; +OPTIMIZE TABLE t1 WAIT 1; +DROP INDEX i1 ON t1 WAIT 1; +TRUNCATE TABLE t1 WAIT 1; +RENAME TABLE t1 WAIT 1 TO t2; +RENAME TABLE t2 NOWAIT TO t1; + +connect(con1, localhost, root,,); +LOCK TABLE t1 WRITE WAIT 31536001; + +connection default; +--error ER_LOCK_WAIT_TIMEOUT +CREATE INDEX i1 ON t1(a) WAIT 0; +--error ER_LOCK_WAIT_TIMEOUT +CREATE INDEX i1 ON t1(a) NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +CREATE FULLTEXT INDEX i2 ON t1(b) WAIT 0; +--error ER_LOCK_WAIT_TIMEOUT +CREATE FULLTEXT INDEX i2 ON t1(b) NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +CREATE SPATIAL INDEX i3 ON t1(c) WAIT 0; +--error ER_LOCK_WAIT_TIMEOUT +CREATE SPATIAL INDEX i3 ON t1(c) NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +ALTER TABLE t1 WAIT 0 COMMENT='test'; +--error ER_LOCK_WAIT_TIMEOUT +ALTER TABLE t1 NOWAIT COMMENT='test'; +OPTIMIZE TABLE t1 WAIT 0; +OPTIMIZE TABLE t1 NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +DROP INDEX i1 ON t1 WAIT 0; +--error ER_LOCK_WAIT_TIMEOUT +DROP INDEX i1 ON t1 NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +TRUNCATE TABLE t1 WAIT 0; +--error ER_LOCK_WAIT_TIMEOUT +TRUNCATE TABLE t1 NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +RENAME TABLE t1 WAIT 0 TO t2; +--error ER_LOCK_WAIT_TIMEOUT +RENAME TABLE t1 NOWAIT TO t2; +--error ER_LOCK_WAIT_TIMEOUT +DROP TABLE t1 WAIT 0; +--error ER_LOCK_WAIT_TIMEOUT +DROP TABLE t1 NOWAIT; +--error ER_LOCK_WAIT_TIMEOUT +LOCK TABLE t1 WRITE WAIT 0; +--error ER_LOCK_WAIT_TIMEOUT +LOCK TABLE t1 WRITE NOWAIT; + +disconnect con1; +DROP TABLE t1 WAIT 1; diff --git a/mysql-test/t/transaction_timeout.test b/mysql-test/t/transaction_timeout.test new file mode 100644 index 00000000000..36d835cc381 --- /dev/null +++ b/mysql-test/t/transaction_timeout.test @@ -0,0 +1,54 @@ +--source include/no_protocol.inc +--source include/have_innodb.inc +--source include/not_embedded.inc + +CREATE TABLE t1 (a INT) ENGINE=InnoDB; + +--echo # Test idle_transaction_timeout +connect (c0,localhost,root,,test,,); +SHOW VARIABLES LIKE 'idle_%transaction_timeout'; +SET autocommit=0; +SET idle_transaction_timeout=1; + +BEGIN; +SELECT * FROM t1; +sleep 2; + +--error 2006,2013 +SELECT * FROM t1; +disconnect c0; + +--echo # Test idle_readonly_transaction_timeout +connect (c1,localhost,root,,test,,); +SHOW VARIABLES LIKE 'idle_%transaction_timeout'; +SET autocommit=0; +SET idle_readonly_transaction_timeout=1; + +BEGIN; +SELECT * FROM t1; +sleep 2; + +--error 2006,2013 # Gone away +SELECT * FROM t1; +disconnect c1; + +--echo # Test idle_readwrite_transaction_timeout +connect (c2,localhost,root,,test,,); +SHOW VARIABLES LIKE 'idle_%transaction_timeout'; +SET autocommit=0; +SET idle_readwrite_transaction_timeout=1; + +BEGIN; +SELECT * FROM t1; +sleep 2; + +SELECT * FROM t1; +INSERT INTO t1 VALUES (1); +sleep 2; + +--error 2006, 2013 # Gone away +SELECT * FROM t1; +disconnect c2; + +connection default; +DROP TABLE t1; diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index 62be5edd334..08a42d543e2 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -295,7 +295,6 @@ innodb.innodb_stats_persistent : Added in 10.2.7 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_corruption : MDEV-13251 - Wrong result innodb.log_data_file_size : Modified in 10.2.7 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:* |