1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after merge test case fixes

Browse Source
This commit is contained in:
Sergei Golubchik 2014-05-08 10:25:16 +02:00
parent 99027efd14
commit c8ee83ee8a
8 changed files with 128 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/have_innodb.combinations
View File

@ -9,6 +9,7 @@ innodb-buffer-page
innodb-buffer-page-lru innodb-buffer-page-lru
innodb-sys-foreign innodb-sys-foreign
innodb-sys-foreign-col innodb-sys-foreign-col
innodb-sys-tables
innodb-metrics innodb-metrics
[xtradb_plugin] [xtradb_plugin]
@ -22,6 +23,7 @@ innodb-buffer-page
innodb-buffer-page-lru innodb-buffer-page-lru
innodb-sys-foreign innodb-sys-foreign
innodb-sys-foreign-col innodb-sys-foreign-col
innodb-sys-tables
innodb-metrics innodb-metrics
[xtradb] [xtradb]
@ -34,4 +36,5 @@ innodb-buffer-page
innodb-buffer-page-lru innodb-buffer-page-lru
innodb-sys-foreign innodb-sys-foreign
innodb-sys-foreign-col innodb-sys-foreign-col
innodb-sys-tables
innodb-metrics innodb-metrics

2
mysql-test/r/innodb_mysql_sync.result
View File

@ -413,7 +413,7 @@ DROP TABLE t1;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
#ALTER TABLE FORCE and ALTER TABLE ENGINE uses online rebuild #ALTER TABLE FORCE and ALTER TABLE ENGINE uses online rebuild
#of the table. #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); INSERT INTO t1 VALUES(10, 20);
ALTER TABLE t1 FORCE; ALTER TABLE t1 FORCE;
affected rows: 0 affected rows: 0

2
mysql-test/r/mysqld--help.result
View File

@ -1244,7 +1244,7 @@ performance-schema-max-rwlock-instances 1724
performance-schema-max-socket-classes 10 performance-schema-max-socket-classes 10
performance-schema-max-socket-instances 179 performance-schema-max-socket-instances 179
performance-schema-max-stage-classes 150 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-handles 445
performance-schema-max-table-instances 445 performance-schema-max-table-instances 445
performance-schema-max-thread-classes 50 performance-schema-max-thread-classes 50

26
mysql-test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result Normal file
View File

@ -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

26
mysql-test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result Normal file
View File

@ -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

34
mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test Normal file
View File

@ -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;

35
mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test Normal file
View File

@ -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;

3
mysql-test/t/innodb_mysql_sync.test
View File

@ -2,6 +2,7 @@
# Test file for InnoDB tests that require the debug sync facility # Test file for InnoDB tests that require the debug sync facility
# #
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_partition.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
# Save the initial number of concurrent sessions. # 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 #ALTER TABLE FORCE and ALTER TABLE ENGINE uses online rebuild
--echo #of the table. --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); INSERT INTO t1 VALUES(10, 20);
--enable_info --enable_info