Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix --big-test MTR test failures and add more suites to the default #9

Merged
merged 1 commit into from
Feb 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mysql-test/mysql-test-run.pl
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ END

# If you add a new suite, please check TEST_DIRS in Makefile.am.
#
my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_fts,innodb_zip,perfschema,funcs_1,opt_trace,parts,auth_sec,query_response_time";
my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_fts,innodb_zip,perfschema,funcs_1,funcs_2,opt_trace,parts,auth_sec,jp,stress,engines/iuds,engines/funcs,query_response_time";
my $opt_suites;

our $opt_verbose= 0; # Verbose output, enable with --verbose
Expand Down
20 changes: 20 additions & 0 deletions mysql-test/r/information_schema-big.result
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@ AND t.table_name NOT LIKE 'ndb%'
AND t.table_name NOT LIKE 'innodb%';
table_name column_name
CHARACTER_SETS CHARACTER_SET_NAME
CLIENT_STATISTICS CLIENT
COLLATIONS COLLATION_NAME
COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
COLUMNS TABLE_SCHEMA
COLUMN_PRIVILEGES TABLE_SCHEMA
INDEX_STATISTICS TABLE_SCHEMA
ENGINES ENGINE
EVENTS EVENT_SCHEMA
FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME
GLOBAL_TEMPORARY_TABLES TABLE_SCHEMA
GLOBAL_VARIABLES VARIABLE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
OPTIMIZER_TRACE QUERY
Expand All @@ -48,9 +51,16 @@ TABLES TABLE_SCHEMA
TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA
TABLE_STATISTICS TABLE_SCHEMA
TEMPORARY_TABLES TABLE_SCHEMA
THREAD_STATISTICS THREAD_ID
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
XTRADB_INTERNAL_HASH_TABLES INTERNAL_HASH_TABLE_NAME
XTRADB_RSEG rseg_id
XTRADB_READ_VIEW READ_VIEW_UNDO_NUMBER
SELECT t.table_name, c1.column_name
FROM information_schema.tables t
INNER JOIN
Expand All @@ -69,14 +79,17 @@ AND t.table_name NOT LIKE 'ndb%'
AND t.table_name NOT LIKE 'innodb%';
table_name column_name
CHARACTER_SETS CHARACTER_SET_NAME
CLIENT_STATISTICS CLIENT
COLLATIONS COLLATION_NAME
COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
COLUMNS TABLE_SCHEMA
COLUMN_PRIVILEGES TABLE_SCHEMA
INDEX_STATISTICS TABLE_SCHEMA
ENGINES ENGINE
EVENTS EVENT_SCHEMA
FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME
GLOBAL_TEMPORARY_TABLES TABLE_SCHEMA
GLOBAL_VARIABLES VARIABLE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
OPTIMIZER_TRACE QUERY
Expand All @@ -96,6 +109,13 @@ TABLES TABLE_SCHEMA
TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA
TABLE_STATISTICS TABLE_SCHEMA
TEMPORARY_TABLES TABLE_SCHEMA
THREAD_STATISTICS THREAD_ID
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER
VIEWS TABLE_SCHEMA
XTRADB_INTERNAL_HASH_TABLES INTERNAL_HASH_TABLE_NAME
XTRADB_RSEG rseg_id
XTRADB_READ_VIEW READ_VIEW_UNDO_NUMBER
20 changes: 10 additions & 10 deletions mysql-test/r/variables-big.result
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
SET @def_var= @@session.transaction_prealloc_size;
SET SESSION transaction_prealloc_size=1024*1024*1024*1;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
Id User Host db Command Time State Info Rows_sent Rows_examined
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
SET SESSION transaction_prealloc_size=1024*1024*1024*2;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
Id User Host db Command Time State Info Rows_sent Rows_examined
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
SET SESSION transaction_prealloc_size=1024*1024*1024*3;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
Id User Host db Command Time State Info Rows_sent Rows_examined
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
SET SESSION transaction_prealloc_size=1024*1024*1024*4;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
Id User Host db Command Time State Info Rows_sent Rows_examined
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
SET SESSION transaction_prealloc_size=1024*1024*1024*5;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
Id User Host db Command Time State Info Rows_sent Rows_examined
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
SET @@session.transaction_prealloc_size= @def_var;