Merge lp:~laurynas-biveinis/percona-server/expand-mtr into lp:percona-server/5.6

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 742
Merged at revision: 742
Proposed branch: lp:~laurynas-biveinis/percona-server/expand-mtr
Merge into: lp:percona-server/5.6
Diff against target: 120 lines (+31/-11)
3 files modified
mysql-test/mysql-test-run.pl (+1/-1)
mysql-test/r/information_schema-big.result (+20/-0)
mysql-test/r/variables-big.result (+10/-10)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/expand-mtr
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+249459@code.launchpad.net

Description of the change

Fix --big-test MTR test failures and add more suites to the default
suite list, implementing
https://blueprints.launchpad.net/percona-server/+spec/mtr-big-test-more-suites.

The --big-test failures fixed (bug 1419827) are
information_schema-big, and variables-big, were a simple re-record was
a sufficient fix.

The extra suites added to the default run are
funcs_2,jp,stress,engines/iuds,engines/funcs.

http://jenkins.percona.com/job/percona-server-5.6-param/817/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl 2014-12-16 06:00:17 +0000
+++ mysql-test/mysql-test-run.pl 2015-02-12 09:00:24 +0000
@@ -164,7 +164,7 @@
164164
165# If you add a new suite, please check TEST_DIRS in Makefile.am.165# If you add a new suite, please check TEST_DIRS in Makefile.am.
166#166#
167my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_fts,innodb_zip,perfschema,funcs_1,opt_trace,parts,auth_sec,query_response_time";167my $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";
168my $opt_suites;168my $opt_suites;
169169
170our $opt_verbose= 0; # Verbose output, enable with --verbose170our $opt_verbose= 0; # Verbose output, enable with --verbose
171171
=== modified file 'mysql-test/r/information_schema-big.result'
--- mysql-test/r/information_schema-big.result 2014-12-01 07:53:48 +0000
+++ mysql-test/r/information_schema-big.result 2015-02-12 09:00:24 +0000
@@ -21,14 +21,17 @@
21 AND t.table_name NOT LIKE 'innodb%';21 AND t.table_name NOT LIKE 'innodb%';
22table_name column_name22table_name column_name
23CHARACTER_SETS CHARACTER_SET_NAME23CHARACTER_SETS CHARACTER_SET_NAME
24CLIENT_STATISTICS CLIENT
24COLLATIONS COLLATION_NAME25COLLATIONS COLLATION_NAME
25COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME26COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
26COLUMNS TABLE_SCHEMA27COLUMNS TABLE_SCHEMA
27COLUMN_PRIVILEGES TABLE_SCHEMA28COLUMN_PRIVILEGES TABLE_SCHEMA
29INDEX_STATISTICS TABLE_SCHEMA
28ENGINES ENGINE30ENGINES ENGINE
29EVENTS EVENT_SCHEMA31EVENTS EVENT_SCHEMA
30FILES TABLE_SCHEMA32FILES TABLE_SCHEMA
31GLOBAL_STATUS VARIABLE_NAME33GLOBAL_STATUS VARIABLE_NAME
34GLOBAL_TEMPORARY_TABLES TABLE_SCHEMA
32GLOBAL_VARIABLES VARIABLE_NAME35GLOBAL_VARIABLES VARIABLE_NAME
33KEY_COLUMN_USAGE CONSTRAINT_SCHEMA36KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
34OPTIMIZER_TRACE QUERY37OPTIMIZER_TRACE QUERY
@@ -48,9 +51,16 @@
48TABLESPACES TABLESPACE_NAME51TABLESPACES TABLESPACE_NAME
49TABLE_CONSTRAINTS CONSTRAINT_SCHEMA52TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
50TABLE_PRIVILEGES TABLE_SCHEMA53TABLE_PRIVILEGES TABLE_SCHEMA
54TABLE_STATISTICS TABLE_SCHEMA
55TEMPORARY_TABLES TABLE_SCHEMA
56THREAD_STATISTICS THREAD_ID
51TRIGGERS TRIGGER_SCHEMA57TRIGGERS TRIGGER_SCHEMA
52USER_PRIVILEGES GRANTEE58USER_PRIVILEGES GRANTEE
59USER_STATISTICS USER
53VIEWS TABLE_SCHEMA60VIEWS TABLE_SCHEMA
61XTRADB_INTERNAL_HASH_TABLES INTERNAL_HASH_TABLE_NAME
62XTRADB_RSEG rseg_id
63XTRADB_READ_VIEW READ_VIEW_UNDO_NUMBER
54SELECT t.table_name, c1.column_name64SELECT t.table_name, c1.column_name
55FROM information_schema.tables t65FROM information_schema.tables t
56INNER JOIN66INNER JOIN
@@ -69,14 +79,17 @@
69 AND t.table_name NOT LIKE 'innodb%';79 AND t.table_name NOT LIKE 'innodb%';
70table_name column_name80table_name column_name
71CHARACTER_SETS CHARACTER_SET_NAME81CHARACTER_SETS CHARACTER_SET_NAME
82CLIENT_STATISTICS CLIENT
72COLLATIONS COLLATION_NAME83COLLATIONS COLLATION_NAME
73COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME84COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
74COLUMNS TABLE_SCHEMA85COLUMNS TABLE_SCHEMA
75COLUMN_PRIVILEGES TABLE_SCHEMA86COLUMN_PRIVILEGES TABLE_SCHEMA
87INDEX_STATISTICS TABLE_SCHEMA
76ENGINES ENGINE88ENGINES ENGINE
77EVENTS EVENT_SCHEMA89EVENTS EVENT_SCHEMA
78FILES TABLE_SCHEMA90FILES TABLE_SCHEMA
79GLOBAL_STATUS VARIABLE_NAME91GLOBAL_STATUS VARIABLE_NAME
92GLOBAL_TEMPORARY_TABLES TABLE_SCHEMA
80GLOBAL_VARIABLES VARIABLE_NAME93GLOBAL_VARIABLES VARIABLE_NAME
81KEY_COLUMN_USAGE CONSTRAINT_SCHEMA94KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
82OPTIMIZER_TRACE QUERY95OPTIMIZER_TRACE QUERY
@@ -96,6 +109,13 @@
96TABLESPACES TABLESPACE_NAME109TABLESPACES TABLESPACE_NAME
97TABLE_CONSTRAINTS CONSTRAINT_SCHEMA110TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
98TABLE_PRIVILEGES TABLE_SCHEMA111TABLE_PRIVILEGES TABLE_SCHEMA
112TABLE_STATISTICS TABLE_SCHEMA
113TEMPORARY_TABLES TABLE_SCHEMA
114THREAD_STATISTICS THREAD_ID
99TRIGGERS TRIGGER_SCHEMA115TRIGGERS TRIGGER_SCHEMA
100USER_PRIVILEGES GRANTEE116USER_PRIVILEGES GRANTEE
117USER_STATISTICS USER
101VIEWS TABLE_SCHEMA118VIEWS TABLE_SCHEMA
119XTRADB_INTERNAL_HASH_TABLES INTERNAL_HASH_TABLE_NAME
120XTRADB_RSEG rseg_id
121XTRADB_READ_VIEW READ_VIEW_UNDO_NUMBER
102122
=== modified file 'mysql-test/r/variables-big.result'
--- mysql-test/r/variables-big.result 2014-12-01 07:53:48 +0000
+++ mysql-test/r/variables-big.result 2015-02-12 09:00:24 +0000
@@ -1,22 +1,22 @@
1SET @def_var= @@session.transaction_prealloc_size;1SET @def_var= @@session.transaction_prealloc_size;
2SET SESSION transaction_prealloc_size=1024*1024*1024*1;2SET SESSION transaction_prealloc_size=1024*1024*1024*1;
3SHOW PROCESSLIST;3SHOW PROCESSLIST;
4Id User Host db Command Time State Info4Id User Host db Command Time State Info Rows_sent Rows_examined
5<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST5<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
6SET SESSION transaction_prealloc_size=1024*1024*1024*2;6SET SESSION transaction_prealloc_size=1024*1024*1024*2;
7SHOW PROCESSLIST;7SHOW PROCESSLIST;
8Id User Host db Command Time State Info8Id User Host db Command Time State Info Rows_sent Rows_examined
9<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST9<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
10SET SESSION transaction_prealloc_size=1024*1024*1024*3;10SET SESSION transaction_prealloc_size=1024*1024*1024*3;
11SHOW PROCESSLIST;11SHOW PROCESSLIST;
12Id User Host db Command Time State Info12Id User Host db Command Time State Info Rows_sent Rows_examined
13<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST13<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
14SET SESSION transaction_prealloc_size=1024*1024*1024*4;14SET SESSION transaction_prealloc_size=1024*1024*1024*4;
15SHOW PROCESSLIST;15SHOW PROCESSLIST;
16Id User Host db Command Time State Info16Id User Host db Command Time State Info Rows_sent Rows_examined
17<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST17<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
18SET SESSION transaction_prealloc_size=1024*1024*1024*5;18SET SESSION transaction_prealloc_size=1024*1024*1024*5;
19SHOW PROCESSLIST;19SHOW PROCESSLIST;
20Id User Host db Command Time State Info20Id User Host db Command Time State Info Rows_sent Rows_examined
21<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST21<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
22SET @@session.transaction_prealloc_size= @def_var;22SET @@session.transaction_prealloc_size= @def_var;

Subscribers

People subscribed via source and target branches