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

[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)
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

[Oleg Tsarev (tsarev)]

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

[Oleg Tsarev (tsarev)]

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]

283. By Oleg Tsarev on 2011-09-03

update from lp:percona-server/5.1

Unmerged revisions

283. By Oleg Tsarev on 2011-09-03

update from lp:percona-server/5.1

282. By Oleg Tsarev on 2011-09-03

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

281. By Oleg Tsarev on 2011-09-03

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

280. By Oleg Tsarev on 2011-09-03

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)

=== 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 @@
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 --echo # Establish connection con1 (user=root)
 connect (con1,localhost,root,,);
 --echo # Establish connection con2 (user=root)

=== 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 @@
 # Test for 'innodb_lazy_drop_table' variable
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 --disable_warnings
 DROP TABLE IF EXISTS t1; 
 --enable_warnings

=== 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 @@
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 show variables like 'innodb_buffer_pool_shm%';
 

=== 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 @@
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 show variables like 'innodb_doublewrite%';

=== 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 @@
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 show variables like 'innodb_use_sys_stats%';

=== 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 @@
 --source include/have_response_time_distribution.inc
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;

=== 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 @@
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 select * from information_schema.XTRADB_ADMIN_COMMAND;
 select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_HELLO*/;

=== 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 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET @old_innodb_file_format=@@innodb_file_format;
 SET @old_innodb_file_per_table=@@innodb_file_per_table;

=== 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 @@
---source include/have_innodb.inc
+--source include/have_innodb_plugin.inc
 --disable_warnings
 DROP TABLE IF EXISTS t1; 
 --enable_warnings

=== 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 @@
  
  # Following are negative tests, all should fail.
  --disable_warnings
---- a/mysql-test/include/have_innodb.inc
-+++ b/mysql-test/include/have_innodb.inc
-@@ -1,4 +1,4 @@
--if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
-+if (`select count(*)>0 from information_schema.plugins where plugin_name like 'xtradb%'`)
- {
-   --skip Test requires InnoDB.
- }

=== 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 @@
  MYSQL_PLUGIN_DYNAMIC(innodb_plugin,  [ha_innodb_plugin.la])
  MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
    AC_CHECK_HEADERS(sched.h)
+--- a/mysql-test/mysql-test-run.pl
++++ b/mysql-test/mysql-test-run.pl
+@@ -157,7 +157,7 @@
+ # executables will be used by the test suite.
+ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
+ 
+-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
++my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb_plugin";
+ my $opt_suites;
+ 
+ our $opt_verbose= 0;  # Verbose output, enable with --verbose
+@@ -345,7 +345,14 @@
+       }
+     }
+   }
+-
++  if ( @opt_cases )
++  {
++    mtr_report("Running test cases: @opt_cases");
++  }
++  elsif ( $opt_suites )
++  {
++    mtr_report("Running suites: $opt_suites");
++  }
+   mtr_report("Collecting tests...");
+   my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases);
+ 
+--- a/mysql-test/mtr
++++ b/mysql-test/mtr
+@@ -157,7 +157,7 @@
+ # executables will be used by the test suite.
+ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
+ 
+-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
++my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb_plugin";
+ my $opt_suites;
+ 
+ our $opt_verbose= 0;  # Verbose output, enable with --verbose
+@@ -345,7 +345,14 @@
+       }
+     }
+   }
+-
++  if ( @opt_cases )
++  {
++    mtr_report("Running test cases: @opt_cases");
++  }
++  elsif ( $opt_suites )
++  {
++    mtr_report("Running suites: $opt_suites");
++  }
+   mtr_report("Collecting tests...");
+   my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases);
+ 
+--- a/mysql-test/mysql-test-run
++++ b/mysql-test/mysql-test-run
+@@ -157,7 +157,7 @@
+ # executables will be used by the test suite.
+ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
+ 
+-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
++my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb_plugin";
+ my $opt_suites;
+ 
+ our $opt_verbose= 0;  # Verbose output, enable with --verbose
+@@ -345,7 +345,14 @@
+       }
+     }
+   }
+-
++  if ( @opt_cases )
++  {
++    mtr_report("Running test cases: @opt_cases");
++  }
++  elsif ( $opt_suites )
++  {
++    mtr_report("Running suites: $opt_suites");
++  }
+   mtr_report("Collecting tests...");
+   my $tests= collect_test_cases($opt_reorder, $opt_suites, \@opt_cases);
+ 

=== 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 @@
  select count(*) from t1 where
  key1a = 2 and key1b is null and key3a = 2 and key3b is null;
  count(*)
+@@ -346,7 +346,7 @@
+ FROM t1
+ WHERE c = 1 AND b = 1 AND d = 1;
+ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+-1	SIMPLE	t1	index_merge	c,bd	c,bd	5,10	NULL	1	Using intersect(c,bd); Using where; Using index
++1	SIMPLE	t1	ref	c,bd	bd	10	const,const	2	Using where
+ CREATE TABLE t2 ( a INT )
+ SELECT a
+ FROM t1
 --- a/mysql-test/r/index_merge_myisam.result
 +++ b/mysql-test/r/index_merge_myisam.result
 @@ -945,7 +945,7 @@
@@ -3989,4 +3998,55 @@
  
  connection slave;
  drop table first_db.t1;
-
+--- a/mysql-test/r/endspace.result
++++ b/mysql-test/r/endspace.result
+@@ -201,12 +201,12 @@
+ text1
+ teststring	
+ teststring 
+-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
++select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1,2;
+ text1	length(text1)
+ teststring		11
+ teststring	10
+ teststring 	11
+-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
++select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1,2;
+ text1	length(text1)
+ teststring		11
+ teststring	10
+--- a/mysql-test/t/endspace.test
++++ b/mysql-test/t/endspace.test
+@@ -93,8 +93,8 @@
+ select * from t1 where text1 like 'teststring_%';
+ 
+ # The following gives wrong result in InnoDB
+-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
+-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
++select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1,2;
++select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1,2;
+ select concat('|', text1, '|') from t1 order by text1;
+ drop table t1;
+ 
+--- a/mysql-test/r/rowid_order_innodb.result
++++ b/mysql-test/r/rowid_order_innodb.result
+@@ -15,7 +15,7 @@
+ (10, 1, 1);
+ explain select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
+ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+-1	SIMPLE	t1	index_merge	key1,key2	key1,key2	5,5	NULL	4	Using sort_union(key1,key2); Using where
++1	SIMPLE	t1	index_merge	key1,key2	key1,key2	5,5	NULL	5	Using sort_union(key1,key2); Using where
+ select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
+ pk1	key1	key2
+ -100	1	1
+--- a/mysql-test/r/type_bit_innodb.result
++++ b/mysql-test/r/type_bit_innodb.result
+@@ -233,7 +233,7 @@
+ 127	403
+ explain select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
+ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+-1	SIMPLE	t1	range	a	a	2	NULL	19	Using where; Using index; Using filesort
++1	SIMPLE	t1	range	a	a	2	NULL	27	Using where; Using index; Using filesort
+ select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
+ a+0	b+0
+ 44	307

=== 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 @@
 @@ -0,0 +1,48 @@
 +--source include/have_binlog_format_statement.inc
 +--source include/master-slave.inc
-+--source include/have_innodb.inc
++--source include/have_innodb_plugin.inc
 +--let log_file=percona.slow_extended.log_slow_slave_statements-innodb
 +
 +connection master;
@@ -2366,7 +2366,7 @@
 --- /dev/null
 +++ b/mysql-test/t/percona_log_slow_verbosity.test
 @@ -0,0 +1,19 @@
-+--source include/have_innodb.inc
++--source include/have_innodb_plugin.inc
 +--source include/have_debug.inc
 +
 +SET SESSION long_query_time=1;
@@ -2505,7 +2505,7 @@
 +++ b/mysql-test/t/percona_use_global_log_slow_control.test
 @@ -0,0 +1,28 @@
 +--source include/have_debug.inc
-+--source include/have_innodb.inc
++--source include/have_innodb_plugin.inc
 +
 +SET GLOBAL long_query_time=1;
 +