Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~tsarev/percona-server/5.1_bug_838725_fix into lp:percona-server/5.1

  1. 5.1_bug_838725_fix
  2. Merge into 5.1
Proposed by Oleg Tsarev
Status: Superseded
Proposed branch: lp:~tsarev/percona-server/5.1_bug_838725_fix
Merge into: lp:percona-server/5.1
Diff against target: 296 lines (+154/-21)
13 files modified
mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test (+1/-1)
mysql-test/innodb_fix_misc_bug51325.test (+1/-1)
mysql-test/percona_innodb_buffer_pool_shm.test (+1/-1)
mysql-test/percona_innodb_doublewrite_file.test (+1/-1)
mysql-test/percona_innodb_use_sys_stats_table.test (+1/-1)
mysql-test/percona_server_variables.inc (+1/-1)
mysql-test/percona_xtradb_admin_command.test (+1/-1)
mysql-test/percona_xtradb_bug317074.test (+1/-1)
mysql-test/userstat_bug602047.test (+1/-1)
patches/innodb_bug47167_test_fix.patch (+0/-8)
patches/innodb_swap_builtin_plugin.patch (+81/-0)
patches/mysql-test.diff (+61/-1)
patches/slow_extended.patch (+3/-3)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.1_bug_838725_fix
Reviewer Review Type Date Requested Status
Alexey Kopytov Pending
Review via email: mp+73936@code.launchpad.net

This proposal supersedes a proposal from 2011-09-02.

This proposal has been superseded by a proposal from 2011-09-03.

Description of the change

1. Fixed bug #838725 - some percona's tests doesn't run after commit number 266 (patch patches/innodb_bug47167_test_fix.patch)
2. Remove "innodb" suite from default suites list (mysql-test-run.pl, mysql-test-run, mtr)
3. Add "Running suites: ..." and "Running test cases: ..." output (mysql-test-run.pl, mysql-test-run, mtr)
4. Fixed tests main.index_merge_innodb, main.rowid_order_innodb, main.type_bit_innodb
5. Fixed test main.endspace - http://bugs.mysql.com/bug.php?id=62340

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-centos/1/

Revision history for this message
Oleg Tsarev (tsarev) wrote :

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-centos/8/

lp:~tsarev/percona-server/5.1_bug_838725_fix updated
283. By Oleg Tsarev

update from lp:percona-server/5.1

Unmerged revisions

283. By Oleg Tsarev

update from lp:percona-server/5.1

282. By Oleg Tsarev

fix fails for tests main.index_merge_innodb, main.rowid_order_innodb, main.type_bit_innodb

281. By Oleg Tsarev

fix main.endspace fails
http://bugs.mysql.com/bug.php?id=62340

280. By Oleg Tsarev

1. Fixed bug #838725 - some percona's tests doesn't run after commit number 266 (patch patches/innodb_bug47167_test_fix.patch)
2. Remove "innodb" suite from default suites list (mysql-test-run.pl, mysql-test-run, mtr)
3. Add "Running suites: ..." and "Running test cases: ..." output (mysql-test-run.pl, mysql-test-run, mtr)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test'
--- mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test 2011-06-22 10:21:58 +0000
+++ mysql-test/innodb_deadlock_count.patch/percona_innodb_deadlock_count.test 2011-09-03 12:10:51 +0000
@@ -1,4 +1,4 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2--echo # Establish connection con1 (user=root)2--echo # Establish connection con1 (user=root)
3connect (con1,localhost,root,,);3connect (con1,localhost,root,,);
4--echo # Establish connection con2 (user=root)4--echo # Establish connection con2 (user=root)
55
=== modified file 'mysql-test/innodb_fix_misc_bug51325.test'
--- mysql-test/innodb_fix_misc_bug51325.test 2011-03-09 21:00:46 +0000
+++ mysql-test/innodb_fix_misc_bug51325.test 2011-09-03 12:10:51 +0000
@@ -1,5 +1,5 @@
1# Test for 'innodb_lazy_drop_table' variable1# Test for 'innodb_lazy_drop_table' variable
2--source include/have_innodb.inc2--source include/have_innodb_plugin.inc
3--disable_warnings3--disable_warnings
4DROP TABLE IF EXISTS t1; 4DROP TABLE IF EXISTS t1;
5--enable_warnings5--enable_warnings
66
=== modified file 'mysql-test/percona_innodb_buffer_pool_shm.test'
--- mysql-test/percona_innodb_buffer_pool_shm.test 2011-06-22 02:53:48 +0000
+++ mysql-test/percona_innodb_buffer_pool_shm.test 2011-09-03 12:10:51 +0000
@@ -1,3 +1,3 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2show variables like 'innodb_buffer_pool_shm%';2show variables like 'innodb_buffer_pool_shm%';
33
44
=== modified file 'mysql-test/percona_innodb_doublewrite_file.test'
--- mysql-test/percona_innodb_doublewrite_file.test 2010-05-26 10:15:29 +0000
+++ mysql-test/percona_innodb_doublewrite_file.test 2011-09-03 12:10:51 +0000
@@ -1,2 +1,2 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2show variables like 'innodb_doublewrite%';2show variables like 'innodb_doublewrite%';
33
=== modified file 'mysql-test/percona_innodb_use_sys_stats_table.test'
--- mysql-test/percona_innodb_use_sys_stats_table.test 2010-07-06 08:20:44 +0000
+++ mysql-test/percona_innodb_use_sys_stats_table.test 2011-09-03 12:10:51 +0000
@@ -1,2 +1,2 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2show variables like 'innodb_use_sys_stats%';2show variables like 'innodb_use_sys_stats%';
33
=== modified file 'mysql-test/percona_server_variables.inc'
--- mysql-test/percona_server_variables.inc 2011-06-23 02:21:00 +0000
+++ mysql-test/percona_server_variables.inc 2011-09-03 12:10:51 +0000
@@ -1,3 +1,3 @@
1--source include/have_response_time_distribution.inc1--source include/have_response_time_distribution.inc
2--source include/have_innodb.inc2--source include/have_innodb_plugin.inc
3SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;3SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
44
=== modified file 'mysql-test/percona_xtradb_admin_command.test'
--- mysql-test/percona_xtradb_admin_command.test 2010-05-20 10:47:38 +0000
+++ mysql-test/percona_xtradb_admin_command.test 2011-09-03 12:10:51 +0000
@@ -1,3 +1,3 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2select * from information_schema.XTRADB_ADMIN_COMMAND;2select * from information_schema.XTRADB_ADMIN_COMMAND;
3select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_HELLO*/;3select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_HELLO*/;
44
=== modified file 'mysql-test/percona_xtradb_bug317074.test'
--- mysql-test/percona_xtradb_bug317074.test 2010-06-16 09:40:57 +0000
+++ mysql-test/percona_xtradb_bug317074.test 2011-09-03 12:10:51 +0000
@@ -1,4 +1,4 @@
1-- source include/have_innodb.inc1-- source include/have_innodb_plugin.inc
22
3SET @old_innodb_file_format=@@innodb_file_format;3SET @old_innodb_file_format=@@innodb_file_format;
4SET @old_innodb_file_per_table=@@innodb_file_per_table;4SET @old_innodb_file_per_table=@@innodb_file_per_table;
55
=== modified file 'mysql-test/userstat_bug602047.test'
--- mysql-test/userstat_bug602047.test 2011-02-26 09:03:28 +0000
+++ mysql-test/userstat_bug602047.test 2011-09-03 12:10:51 +0000
@@ -1,4 +1,4 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2--disable_warnings2--disable_warnings
3DROP TABLE IF EXISTS t1; 3DROP TABLE IF EXISTS t1;
4--enable_warnings4--enable_warnings
55
=== modified file 'patches/innodb_bug47167_test_fix.patch'
--- patches/innodb_bug47167_test_fix.patch 2011-08-01 17:56:34 +0000
+++ patches/innodb_bug47167_test_fix.patch 2011-09-03 12:10:51 +0000
@@ -42,11 +42,3 @@
42 42
43 # Following are negative tests, all should fail.43 # Following are negative tests, all should fail.
44 --disable_warnings44 --disable_warnings
45--- a/mysql-test/include/have_innodb.inc
46+++ b/mysql-test/include/have_innodb.inc
47@@ -1,4 +1,4 @@
48-if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
49+if (`select count(*)>0 from information_schema.plugins where plugin_name like 'xtradb%'`)
50 {
51 --skip Test requires InnoDB.
52 }
5345
=== modified file 'patches/innodb_swap_builtin_plugin.patch'
--- patches/innodb_swap_builtin_plugin.patch 2011-08-09 13:35:34 +0000
+++ patches/innodb_swap_builtin_plugin.patch 2011-09-03 12:10:51 +0000
@@ -198,3 +198,84 @@
198 MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la])198 MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la])
199 MYSQL_PLUGIN_ACTIONS(innodb_plugin, [199 MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
200 AC_CHECK_HEADERS(sched.h)200 AC_CHECK_HEADERS(sched.h)
201--- a/mysql-test/mysql-test-run.pl
202+++ b/mysql-test/mysql-test-run.pl
203@@ -157,7 +157,7 @@
204 # executables will be used by the test suite.
205 our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
206
207-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
208+my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb_plugin";
209 my $opt_suites;
210
211 our $opt_verbose= 0; # Verbose output, enable with --verbose
212@@ -345,7 +345,14 @@
213 }
214 }
215 }
216-
217+ if ( @opt_cases )
218+ {
219+ mtr_report("Running test cases: @opt_cases");
220+ }
221+ elsif ( $opt_suites )
222+ {
223+ mtr_report("Running suites: $opt_suites");
224+ }
225 mtr_report("Collecting tests...");
226 my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases);
227
228--- a/mysql-test/mtr
229+++ b/mysql-test/mtr
230@@ -157,7 +157,7 @@
231 # executables will be used by the test suite.
232 our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
233
234-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
235+my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb_plugin";
236 my $opt_suites;
237
238 our $opt_verbose= 0; # Verbose output, enable with --verbose
239@@ -345,7 +345,14 @@
240 }
241 }
242 }
243-
244+ if ( @opt_cases )
245+ {
246+ mtr_report("Running test cases: @opt_cases");
247+ }
248+ elsif ( $opt_suites )
249+ {
250+ mtr_report("Running suites: $opt_suites");
251+ }
252 mtr_report("Collecting tests...");
253 my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases);
254
255--- a/mysql-test/mysql-test-run
256+++ b/mysql-test/mysql-test-run
257@@ -157,7 +157,7 @@
258 # executables will be used by the test suite.
259 our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
260
261-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
262+my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb_plugin";
263 my $opt_suites;
264
265 our $opt_verbose= 0; # Verbose output, enable with --verbose
266@@ -345,7 +345,14 @@
267 }
268 }
269 }
270-
271+ if ( @opt_cases )
272+ {
273+ mtr_report("Running test cases: @opt_cases");
274+ }
275+ elsif ( $opt_suites )
276+ {
277+ mtr_report("Running suites: $opt_suites");
278+ }
279 mtr_report("Collecting tests...");
280 my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases);
281
201282
=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff 2011-08-13 01:47:38 +0000
+++ patches/mysql-test.diff 2011-09-03 12:10:51 +0000
@@ -57,6 +57,15 @@
57 select count(*) from t1 where57 select count(*) from t1 where
58 key1a = 2 and key1b is null and key3a = 2 and key3b is null;58 key1a = 2 and key1b is null and key3a = 2 and key3b is null;
59 count(*)59 count(*)
60@@ -346,7 +346,7 @@
61 FROM t1
62 WHERE c = 1 AND b = 1 AND d = 1;
63 id select_type table type possible_keys key key_len ref rows Extra
64-1 SIMPLE t1 index_merge c,bd c,bd 5,10 NULL 1 Using intersect(c,bd); Using where; Using index
65+1 SIMPLE t1 ref c,bd bd 10 const,const 2 Using where
66 CREATE TABLE t2 ( a INT )
67 SELECT a
68 FROM t1
60--- a/mysql-test/r/index_merge_myisam.result69--- a/mysql-test/r/index_merge_myisam.result
61+++ b/mysql-test/r/index_merge_myisam.result70+++ b/mysql-test/r/index_merge_myisam.result
62@@ -945,7 +945,7 @@71@@ -945,7 +945,7 @@
@@ -3989,4 +3998,55 @@
3989 3998
3990 connection slave;3999 connection slave;
3991 drop table first_db.t1;4000 drop table first_db.t1;
39924001--- a/mysql-test/r/endspace.result
4002+++ b/mysql-test/r/endspace.result
4003@@ -201,12 +201,12 @@
4004 text1
4005 teststring
4006 teststring
4007-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
4008+select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1,2;
4009 text1 length(text1)
4010 teststring 11
4011 teststring 10
4012 teststring 11
4013-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
4014+select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1,2;
4015 text1 length(text1)
4016 teststring 11
4017 teststring 10
4018--- a/mysql-test/t/endspace.test
4019+++ b/mysql-test/t/endspace.test
4020@@ -93,8 +93,8 @@
4021 select * from t1 where text1 like 'teststring_%';
4022
4023 # The following gives wrong result in InnoDB
4024-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
4025-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
4026+select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1,2;
4027+select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1,2;
4028 select concat('|', text1, '|') from t1 order by text1;
4029 drop table t1;
4030
4031--- a/mysql-test/r/rowid_order_innodb.result
4032+++ b/mysql-test/r/rowid_order_innodb.result
4033@@ -15,7 +15,7 @@
4034 (10, 1, 1);
4035 explain select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
4036 id select_type table type possible_keys key key_len ref rows Extra
4037-1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 4 Using sort_union(key1,key2); Using where
4038+1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 5 Using sort_union(key1,key2); Using where
4039 select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
4040 pk1 key1 key2
4041 -100 1 1
4042--- a/mysql-test/r/type_bit_innodb.result
4043+++ b/mysql-test/r/type_bit_innodb.result
4044@@ -233,7 +233,7 @@
4045 127 403
4046 explain select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
4047 id select_type table type possible_keys key key_len ref rows Extra
4048-1 SIMPLE t1 range a a 2 NULL 19 Using where; Using index; Using filesort
4049+1 SIMPLE t1 range a a 2 NULL 27 Using where; Using index; Using filesort
4050 select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
4051 a+0 b+0
4052 44 307
39934053
=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch 2011-08-09 13:35:34 +0000
+++ patches/slow_extended.patch 2011-09-03 12:10:51 +0000
@@ -2098,7 +2098,7 @@
2098@@ -0,0 +1,48 @@2098@@ -0,0 +1,48 @@
2099+--source include/have_binlog_format_statement.inc2099+--source include/have_binlog_format_statement.inc
2100+--source include/master-slave.inc2100+--source include/master-slave.inc
2101+--source include/have_innodb.inc2101+--source include/have_innodb_plugin.inc
2102+--let log_file=percona.slow_extended.log_slow_slave_statements-innodb2102+--let log_file=percona.slow_extended.log_slow_slave_statements-innodb
2103+2103+
2104+connection master;2104+connection master;
@@ -2366,7 +2366,7 @@
2366--- /dev/null2366--- /dev/null
2367+++ b/mysql-test/t/percona_log_slow_verbosity.test2367+++ b/mysql-test/t/percona_log_slow_verbosity.test
2368@@ -0,0 +1,19 @@2368@@ -0,0 +1,19 @@
2369+--source include/have_innodb.inc2369+--source include/have_innodb_plugin.inc
2370+--source include/have_debug.inc2370+--source include/have_debug.inc
2371+2371+
2372+SET SESSION long_query_time=1;2372+SET SESSION long_query_time=1;
@@ -2505,7 +2505,7 @@
2505+++ b/mysql-test/t/percona_use_global_log_slow_control.test2505+++ b/mysql-test/t/percona_use_global_log_slow_control.test
2506@@ -0,0 +1,28 @@2506@@ -0,0 +1,28 @@
2507+--source include/have_debug.inc2507+--source include/have_debug.inc
2508+--source include/have_innodb.inc2508+--source include/have_innodb_plugin.inc
2509+2509+
2510+SET GLOBAL long_query_time=1;2510+SET GLOBAL long_query_time=1;
2511+2511+

Subscribers

People subscribed via source and target branches