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

[Oleg Tsarev]

NOTE: This branch NOT FOR MERGE, JUST FOR REVIEW

FAILED TESTS:
1. main.percona_innodb_kill_idle_trx main.percona_innodb_kill_idle_trx_locks
2. main.percona_server_variables_debug main.percona_server_variables_release

FAILED TESTCASES (JUST DEBUG):
1. rpl.rpl_binlog_errors

DESCRIPTION:
  Fixed tests main.index_merge_innodb, main.rowid_order_innodb, main.type_bit_innodb, main.endspace broken on revision number 279 (bug #832528) (according to bug #838725 tests doesn't run on revision number 279)

=== modified file 'patches/bug53761.patch'
--- patches/bug53761.patch	2011-08-24 11:40:25 +0000
+++ patches/bug53761.patch	2011-10-08 00:51:17 +0000
@@ -407,3 +407,66 @@
  SELECT COUNT(*) FROM
  (SELECT * FROM t1 FORCE INDEX (idx,PRIMARY)
  WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t;
+--- a/mysql-test/r/index_merge_innodb.result
++++ b/mysql-test/r/index_merge_innodb.result
+@@ -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/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
+--- 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;
+ 

=== 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-10-08 00:51:17 +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-10-08 00:51:17 +0000
@@ -198,3 +198,14 @@
  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