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

[Oleg Tsarev]

NOTE: This branch NOT FOR MERGE, JUST FOR REVIEW

FAILED TESTS:
1. main.endspace main.index_merge_innodb main.rowid_order_innodb main.type_bit_innodb
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_832528/+merge/78687

2. main.percona_innodb_kill_idle_trx main.percona_innodb_kill_idle_trx_locks
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691

3. main.percona_server_variables_debug main.percona_server_variables_release
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_860416/+merge/78692

FAILED TESTCASES (JUST DEBUG):
1. rpl.rpl_binlog_errors
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_794790/+merge/78694

DESCRIPTION:
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)

[Laurynas Biveinis (laurynas-biveinis)]

LGTM

review: Approve

[Stewart Smith (stewart)]

review: Approve

=== 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:04:25 +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:04:25 +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