merge from mysql-5.1-innodb_plugin

.bzr-mysql/default.conf

 [MYSQL]
-post_commit_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com"
-post_push_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com"
+post_commit_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com,Tomas.Ulin@Sun.COM,wlad@sun.com"
+post_push_to = "satya.bn@sun.com,svoj@sun.com,joro@sun.com,Tomas.Ulin@Sun.COM,wlad@sun.com"
 tree_name = "mysql-5.1-innodb_plugin"

storage/innodb_plugin/plug.in

@@ -14,7 +14,7 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-MYSQL_STORAGE_ENGINE(innodb_plugin,  innodb, [InnoDB Storage Engine],
+MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
         [Transactional Tables using InnoDB], [max,max-no-ndb])
 MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
 #MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])