From c8ee83ee8a47f2aef311b2e3d78f69448cd8a1f1 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 8 May 2014 10:25:16 +0200 Subject: [PATCH] after merge test case fixes --- mysql-test/include/have_innodb.combinations | 3 ++ mysql-test/r/innodb_mysql_sync.result | 2 +- mysql-test/r/mysqld--help.result | 2 +- ...odb_fil_make_page_dirty_debug_basic.result | 26 ++++++++++++++ ...nnodb_saved_page_number_debug_basic.result | 26 ++++++++++++++ ...nnodb_fil_make_page_dirty_debug_basic.test | 34 ++++++++++++++++++ .../innodb_saved_page_number_debug_basic.test | 35 +++++++++++++++++++ mysql-test/t/innodb_mysql_sync.test | 3 +- 8 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result create mode 100644 mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test diff --git a/mysql-test/include/have_innodb.combinations b/mysql-test/include/have_innodb.combinations index f647f15ddb6..5b8d376d1b9 100644 --- a/mysql-test/include/have_innodb.combinations +++ b/mysql-test/include/have_innodb.combinations @@ -9,6 +9,7 @@ innodb-buffer-page innodb-buffer-page-lru innodb-sys-foreign innodb-sys-foreign-col +innodb-sys-tables innodb-metrics [xtradb_plugin] @@ -22,6 +23,7 @@ innodb-buffer-page innodb-buffer-page-lru innodb-sys-foreign innodb-sys-foreign-col +innodb-sys-tables innodb-metrics [xtradb] @@ -34,4 +36,5 @@ innodb-buffer-page innodb-buffer-page-lru innodb-sys-foreign innodb-sys-foreign-col +innodb-sys-tables innodb-metrics diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/r/innodb_mysql_sync.result index 130b2273120..21e9cd04c22 100644 --- a/mysql-test/r/innodb_mysql_sync.result +++ b/mysql-test/r/innodb_mysql_sync.result @@ -413,7 +413,7 @@ DROP TABLE t1; SET DEBUG_SYNC= 'RESET'; #ALTER TABLE FORCE and ALTER TABLE ENGINE uses online rebuild #of the table. -CREATE TABLE t1(fld1 INT, fld2 INT); +CREATE TABLE t1(fld1 INT, fld2 INT) ENGINE=INNODB; INSERT INTO t1 VALUES(10, 20); ALTER TABLE t1 FORCE; affected rows: 0 diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index f8ce0e35904..47e1851c4ef 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1244,7 +1244,7 @@ performance-schema-max-rwlock-instances 1724 performance-schema-max-socket-classes 10 performance-schema-max-socket-instances 179 performance-schema-max-stage-classes 150 -performance-schema-max-statement-classes 179 +performance-schema-max-statement-classes 180 performance-schema-max-table-handles 445 performance-schema-max-table-instances 445 performance-schema-max-thread-classes 50 diff --git a/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result new file mode 100644 index 00000000000..abf2cdaf1c4 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result @@ -0,0 +1,26 @@ +# +# Basic test for innodb_fil_make_page_dirty_debug. +# +SELECT @@global.innodb_fil_make_page_dirty_debug; +@@global.innodb_fil_make_page_dirty_debug +0 +set global innodb_fil_make_page_dirty_debug = 0; +SELECT @@global.innodb_fil_make_page_dirty_debug; +@@global.innodb_fil_make_page_dirty_debug +0 +set global innodb_fil_make_page_dirty_debug = 0; +set global innodb_fil_make_page_dirty_debug = dummy; +ERROR 42000: Incorrect argument type to variable 'innodb_fil_make_page_dirty_debug' +set innodb_fil_make_page_dirty_debug = ON; +ERROR HY000: Variable 'innodb_fil_make_page_dirty_debug' is a GLOBAL variable and should be set with SET GLOBAL +# An example usage. +create table t1 (f1 int primary key) engine = innodb; +select space from information_schema.innodb_sys_tables +where name = 'test/t1' into @space_id; +set global innodb_saved_page_number_debug = 0; +set global innodb_fil_make_page_dirty_debug = @space_id; +drop table t1; +# Must always be 0. +SELECT @@global.innodb_fil_make_page_dirty_debug; +@@global.innodb_fil_make_page_dirty_debug +0 diff --git a/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result b/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result new file mode 100644 index 00000000000..20e2b78e640 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result @@ -0,0 +1,26 @@ +# +# Basic test for innodb_saved_page_number_debug. +# +SELECT @@global.innodb_saved_page_number_debug; +@@global.innodb_saved_page_number_debug +0 +set global innodb_saved_page_number_debug = 10; +SELECT @@global.innodb_saved_page_number_debug; +@@global.innodb_saved_page_number_debug +10 +set global innodb_saved_page_number_debug = 100; +set global innodb_saved_page_number_debug = dummy; +ERROR 42000: Incorrect argument type to variable 'innodb_saved_page_number_debug' +set innodb_saved_page_number_debug = ON; +ERROR HY000: Variable 'innodb_saved_page_number_debug' is a GLOBAL variable and should be set with SET GLOBAL +# An example usage. +create table t1 (f1 int primary key) engine = innodb; +select space from information_schema.innodb_sys_tables +where name = 'test/t1' into @space_id; +set global innodb_saved_page_number_debug = 0; +set global innodb_fil_make_page_dirty_debug = @space_id; +drop table t1; +set global innodb_saved_page_number_debug = 0; +SELECT @@global.innodb_saved_page_number_debug; +@@global.innodb_saved_page_number_debug +0 diff --git a/mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test new file mode 100644 index 00000000000..950dbabd1bd --- /dev/null +++ b/mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test @@ -0,0 +1,34 @@ +--echo # +--echo # Basic test for innodb_fil_make_page_dirty_debug. +--echo # + +--source include/have_innodb.inc + +# The config variable is a debug variable +-- source include/have_debug.inc + +SELECT @@global.innodb_fil_make_page_dirty_debug; + +set global innodb_fil_make_page_dirty_debug = 0; + +SELECT @@global.innodb_fil_make_page_dirty_debug; + +set global innodb_fil_make_page_dirty_debug = 0; + +--error ER_WRONG_TYPE_FOR_VAR +set global innodb_fil_make_page_dirty_debug = dummy; + +--error ER_GLOBAL_VARIABLE +set innodb_fil_make_page_dirty_debug = ON; + +--echo # An example usage. +create table t1 (f1 int primary key) engine = innodb; +select space from information_schema.innodb_sys_tables +where name = 'test/t1' into @space_id; +set global innodb_saved_page_number_debug = 0; +set global innodb_fil_make_page_dirty_debug = @space_id; +drop table t1; + +--echo # Must always be 0. +SELECT @@global.innodb_fil_make_page_dirty_debug; + diff --git a/mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test new file mode 100644 index 00000000000..74ce3ffc049 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test @@ -0,0 +1,35 @@ +--echo # +--echo # Basic test for innodb_saved_page_number_debug. +--echo # + +--source include/have_innodb.inc + +# The config variable is a debug variable +-- source include/have_debug.inc + +SELECT @@global.innodb_saved_page_number_debug; + +set global innodb_saved_page_number_debug = 10; + +SELECT @@global.innodb_saved_page_number_debug; + +set global innodb_saved_page_number_debug = 100; + +--error ER_WRONG_TYPE_FOR_VAR +set global innodb_saved_page_number_debug = dummy; + +--error ER_GLOBAL_VARIABLE +set innodb_saved_page_number_debug = ON; + +--echo # An example usage. +create table t1 (f1 int primary key) engine = innodb; +select space from information_schema.innodb_sys_tables +where name = 'test/t1' into @space_id; +set global innodb_saved_page_number_debug = 0; +set global innodb_fil_make_page_dirty_debug = @space_id; +drop table t1; + +set global innodb_saved_page_number_debug = 0; + +SELECT @@global.innodb_saved_page_number_debug; + diff --git a/mysql-test/t/innodb_mysql_sync.test b/mysql-test/t/innodb_mysql_sync.test index 6b8aa6d0b89..31365cb8db8 100644 --- a/mysql-test/t/innodb_mysql_sync.test +++ b/mysql-test/t/innodb_mysql_sync.test @@ -2,6 +2,7 @@ # Test file for InnoDB tests that require the debug sync facility # --source include/have_innodb.inc +--source include/have_partition.inc --source include/have_debug.inc --source include/have_debug_sync.inc # Save the initial number of concurrent sessions. @@ -652,7 +653,7 @@ SET DEBUG_SYNC= 'RESET'; --echo #ALTER TABLE FORCE and ALTER TABLE ENGINE uses online rebuild --echo #of the table. -CREATE TABLE t1(fld1 INT, fld2 INT); +CREATE TABLE t1(fld1 INT, fld2 INT) ENGINE=INNODB; INSERT INTO t1 VALUES(10, 20); --enable_info