bzr commit into mysql-5.5-bugfixing branch (magne.mahre:3101) Bug#55547

[Magne Mahre]

#At file:///export/home/tmp/x/mysql-5.5-runtime-test/ based on revid:kostja@stripped

 3101 Magne Mahre	2010-08-12
      Bug #55547 InnoDB is not included when configuring by default
      
      Added InnoDB to the 'default' plugin group, and modified 
      the autoconf script so the 'default' group is actually 
      built by default.
      
      (i.e  ./configure.am == ./configure.am --plugins=default ,
      instead of being ./configure.am --plugins=none )

    modified:
      config/ac-macros/plugins.m4
      configure.in
      storage/innobase/plug.in
=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4	2009-12-22 09:35:56 +0000
+++ b/config/ac-macros/plugins.m4	2010-08-12 10:47:13 +0000
@@ -782,7 +782,7 @@ dnl   Emits shell script for checking co
 dnl   Arguments to this macro is default value for selected plugins
 
 AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[
- __MYSQL_CHECK_PLUGIN_ARGS(m4_default([$1], [none]))
+ __MYSQL_CHECK_PLUGIN_ARGS(m4_default([$1], [default]))
 ])
 
 AC_DEFUN([__MYSQL_CHECK_PLUGIN_ARGS],[

=== modified file 'configure.in'
--- a/configure.in	2010-08-09 13:23:55 +0000
+++ b/configure.in	2010-08-12 10:47:13 +0000
@@ -2606,7 +2606,7 @@ MYSQL_STORAGE_ENGINE(partition, partitio
 
 dnl -- ndbcluster requires partition to be enabled
 
-MYSQL_CONFIGURE_PLUGINS([none])
+MYSQL_CONFIGURE_PLUGINS([default])
 
 # Only build client code?
 AC_ARG_WITH(server,

=== modified file 'storage/innobase/plug.in'
--- a/storage/innobase/plug.in	2010-06-22 15:58:28 +0000
+++ b/storage/innobase/plug.in	2010-08-12 10:47:13 +0000
@@ -15,7 +15,7 @@
 #
 
 MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
-        [Transactional Tables using InnoDB], [max,max-no-ndb])
+        [Transactional Tables using InnoDB], [default,max,max-no-ndb])
 MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
 MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])
 MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])


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