From: Magne Mahre
Date: August 12 2010 10:47am
Subject: bzr commit into mysql-5.5-bugfixing branch (magne.mahre:3101) Bug#55547
List-Archive: http://lists.mysql.com/commits/115564
X-Bug: 55547
Message-Id: <201008121047.o7CAlPLO028889@dm-uk-02.uk.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0938340014225285553=="

--===============0938340014225285553==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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])


--===============0938340014225285553==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magne.mahre@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magne.mahre@stripped
# target_branch: file:///export/home/tmp/x/mysql-5.5-runtime-test/
# testament_sha1: 477befbf6599a3cd2914cc9e0296889c7dac46cb
# timestamp: 2010-08-12 12:47:24 +0200
# base_revision_id: kostja@stripped
# 
# Begin bundle
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


--===============0938340014225285553==--