bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3133)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedolzcn

 3133 Magnus Blåudd	2011-01-19
      Fix test failure of mysqld--help-notwin
       - Add ndbinfo to the list of plugins that may not be there

    modified:
      mysql-test/include/mysqld--help.inc
=== modified file 'mysql-test/include/mysqld--help.inc'
--- a/mysql-test/include/mysqld--help.inc	2010-11-25 15:16:08 +0000
+++ b/mysql-test/include/mysqld--help.inc	2011-01-19 13:28:54 +0000
@@ -21,7 +21,7 @@ perl;
 			   datadir slave-load-tmpdir tmpdir socket/;
 
   # Plugins which may or may not be there:
-  @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file
+  @plugins=qw/innodb ndb ndbinfo archive blackhole federated partition ndbcluster debug temp-pool ssl des-key-file
               thread-concurrency super-large-pages mutex-deadlock-detector null-audit/;
 
   push(@plugins, 'server-id-bits'); # MCP_BUG53205, variable may not be there

Attachment: [text/bzr-bundle] bzr/[e-mail]