bzr push into mysql-trunk branch (vasil.dimov:3929 to 3930)

[vasil.dimov]

 3930 Vasil Dimov	2012-02-20
      Adjust main.innodb_ignore_builtin test after we started to ignore that
      option in vasil.dimov@stripped

    modified:
      mysql-test/r/innodb_ignore_builtin.result
      mysql-test/t/innodb_ignore_builtin.test
 3929 Vasil Dimov	2012-02-20 [merge]
      Merge mysql-5.5 -> mysql-trunk

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
=== modified file 'mysql-test/r/innodb_ignore_builtin.result'
--- a/mysql-test/r/innodb_ignore_builtin.result	revid:vasil.dimov@stripped
+++ b/mysql-test/r/innodb_ignore_builtin.result	revid:vasil.dimov@stripped
@@ -1,9 +1,12 @@
+call mtr.add_suppression("is ignored and will be removed in future releases");
 show variables like 'ignore_builtin_innodb';
 Variable_name	Value
 ignore_builtin_innodb	ON
 select PLUGIN_NAME from information_schema.plugins
 where PLUGIN_NAME = "InnoDb";
 PLUGIN_NAME
+InnoDB
 select ENGINE from information_schema.engines
 where ENGINE = "InnoDB";
 ENGINE
+InnoDB

=== modified file 'mysql-test/t/innodb_ignore_builtin.test'
--- a/mysql-test/t/innodb_ignore_builtin.test	revid:vasil.dimov@stripped
+++ b/mysql-test/t/innodb_ignore_builtin.test	revid:vasil.dimov@stripped
@@ -1,6 +1,12 @@
 #
 # Bug #42610:  Dynamic plugin broken in 5.1.31
 #
+# ignore_builtin_innodb is ignored in MySQL 5.6 (start with InnoDB regardless
+# of the value of that option).
+#
+
+call mtr.add_suppression("is ignored and will be removed in future releases");
+
 show variables like 'ignore_builtin_innodb';
 select PLUGIN_NAME from information_schema.plugins
 where PLUGIN_NAME = "InnoDb";

No bundle (reason: useless for push emails).