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

Proposed by Laurynas Biveinis on 2015-02-12
Status: Merged
Approved by: Laurynas Biveinis on 2015-02-12
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 on 2015-02-12
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.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/mysql-test-run.pl'
2--- mysql-test/mysql-test-run.pl 2014-12-16 06:00:17 +0000
3+++ mysql-test/mysql-test-run.pl 2015-02-12 09:00:24 +0000
4@@ -164,7 +164,7 @@
5
6 # If you add a new suite, please check TEST_DIRS in Makefile.am.
7 #
8-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";
9+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";
10 my $opt_suites;
11
12 our $opt_verbose= 0; # Verbose output, enable with --verbose
13
14=== modified file 'mysql-test/r/information_schema-big.result'
15--- mysql-test/r/information_schema-big.result 2014-12-01 07:53:48 +0000
16+++ mysql-test/r/information_schema-big.result 2015-02-12 09:00:24 +0000
17@@ -21,14 +21,17 @@
18 AND t.table_name NOT LIKE 'innodb%';
19 table_name column_name
20 CHARACTER_SETS CHARACTER_SET_NAME
21+CLIENT_STATISTICS CLIENT
22 COLLATIONS COLLATION_NAME
23 COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
24 COLUMNS TABLE_SCHEMA
25 COLUMN_PRIVILEGES TABLE_SCHEMA
26+INDEX_STATISTICS TABLE_SCHEMA
27 ENGINES ENGINE
28 EVENTS EVENT_SCHEMA
29 FILES TABLE_SCHEMA
30 GLOBAL_STATUS VARIABLE_NAME
31+GLOBAL_TEMPORARY_TABLES TABLE_SCHEMA
32 GLOBAL_VARIABLES VARIABLE_NAME
33 KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
34 OPTIMIZER_TRACE QUERY
35@@ -48,9 +51,16 @@
36 TABLESPACES TABLESPACE_NAME
37 TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
38 TABLE_PRIVILEGES TABLE_SCHEMA
39+TABLE_STATISTICS TABLE_SCHEMA
40+TEMPORARY_TABLES TABLE_SCHEMA
41+THREAD_STATISTICS THREAD_ID
42 TRIGGERS TRIGGER_SCHEMA
43 USER_PRIVILEGES GRANTEE
44+USER_STATISTICS USER
45 VIEWS TABLE_SCHEMA
46+XTRADB_INTERNAL_HASH_TABLES INTERNAL_HASH_TABLE_NAME
47+XTRADB_RSEG rseg_id
48+XTRADB_READ_VIEW READ_VIEW_UNDO_NUMBER
49 SELECT t.table_name, c1.column_name
50 FROM information_schema.tables t
51 INNER JOIN
52@@ -69,14 +79,17 @@
53 AND t.table_name NOT LIKE 'innodb%';
54 table_name column_name
55 CHARACTER_SETS CHARACTER_SET_NAME
56+CLIENT_STATISTICS CLIENT
57 COLLATIONS COLLATION_NAME
58 COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME
59 COLUMNS TABLE_SCHEMA
60 COLUMN_PRIVILEGES TABLE_SCHEMA
61+INDEX_STATISTICS TABLE_SCHEMA
62 ENGINES ENGINE
63 EVENTS EVENT_SCHEMA
64 FILES TABLE_SCHEMA
65 GLOBAL_STATUS VARIABLE_NAME
66+GLOBAL_TEMPORARY_TABLES TABLE_SCHEMA
67 GLOBAL_VARIABLES VARIABLE_NAME
68 KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
69 OPTIMIZER_TRACE QUERY
70@@ -96,6 +109,13 @@
71 TABLESPACES TABLESPACE_NAME
72 TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
73 TABLE_PRIVILEGES TABLE_SCHEMA
74+TABLE_STATISTICS TABLE_SCHEMA
75+TEMPORARY_TABLES TABLE_SCHEMA
76+THREAD_STATISTICS THREAD_ID
77 TRIGGERS TRIGGER_SCHEMA
78 USER_PRIVILEGES GRANTEE
79+USER_STATISTICS USER
80 VIEWS TABLE_SCHEMA
81+XTRADB_INTERNAL_HASH_TABLES INTERNAL_HASH_TABLE_NAME
82+XTRADB_RSEG rseg_id
83+XTRADB_READ_VIEW READ_VIEW_UNDO_NUMBER
84
85=== modified file 'mysql-test/r/variables-big.result'
86--- mysql-test/r/variables-big.result 2014-12-01 07:53:48 +0000
87+++ mysql-test/r/variables-big.result 2015-02-12 09:00:24 +0000
88@@ -1,22 +1,22 @@
89 SET @def_var= @@session.transaction_prealloc_size;
90 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
91 SHOW PROCESSLIST;
92-Id User Host db Command Time State Info
93-<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
94+Id User Host db Command Time State Info Rows_sent Rows_examined
95+<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
96 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
97 SHOW PROCESSLIST;
98-Id User Host db Command Time State Info
99-<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
100+Id User Host db Command Time State Info Rows_sent Rows_examined
101+<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
102 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
103 SHOW PROCESSLIST;
104-Id User Host db Command Time State Info
105-<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
106+Id User Host db Command Time State Info Rows_sent Rows_examined
107+<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
108 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
109 SHOW PROCESSLIST;
110-Id User Host db Command Time State Info
111-<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
112+Id User Host db Command Time State Info Rows_sent Rows_examined
113+<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
114 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
115 SHOW PROCESSLIST;
116-Id User Host db Command Time State Info
117-<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
118+Id User Host db Command Time State Info Rows_sent Rows_examined
119+<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST 0 0
120 SET @@session.transaction_prealloc_size= @def_var;

Subscribers

People subscribed via source and target branches