bzr push into mysql-5.5 branch (hery.ramilison:3480 to 3481)

[Hery Ramilison]

 3481 hery.ramilison@stripped	2011-08-16
      testing fix for bug 55713

    modified:
      extra/innochecksum.c
 3480 Chuck Bell	2011-08-09
      WL#5710 : enable and disable plugins
      
      This patch corrects an error in the test to ensure the proper path
      is used for the --mysqld option.

    modified:
      mysql-test/t/mysql_plugin.test
=== modified file 'extra/innochecksum.c'
--- a/extra/innochecksum.c	2011-07-03 23:48:19 +0000
+++ b/extra/innochecksum.c	2011-08-15 22:06:05 +0000
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <my_config.h>
 
 /* all of these ripped from InnoDB code from MySQL 4.0.22 */
 #define UT_HASH_RANDOM_MASK     1463735687

No bundle (reason: useless for push emails).