diff options
| author | Magne Mahre <magne.mahre@sun.com> | 2010-08-18 10:14:55 +0200 |
|---|---|---|
| committer | Magne Mahre <magne.mahre@sun.com> | 2010-08-18 10:14:55 +0200 |
| commit | 6293c44ff6debb4f617260df727b281e77a41b5c (patch) | |
| tree | f75492703f96762a9f74a7e64b424bbce83ba460 | |
| parent | 968902ddc96e1fd81a35780609e33dba72d437c0 (diff) | |
| download | mariadb-git-6293c44ff6debb4f617260df727b281e77a41b5c.tar.gz | |
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 --with-plugins=default ,
instead of being ./configure.am --with-plugins=none )
| -rw-r--r-- | config/ac-macros/plugins.m4 | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | storage/innobase/plug.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 9fcfc031281..2aed1267fe6 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -782,7 +782,7 @@ dnl Emits shell script for checking configure arguments 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],[ diff --git a/configure.in b/configure.in index 238cfc50a68..59d08f0a9e5 100644 --- a/configure.in +++ b/configure.in @@ -2606,7 +2606,7 @@ MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support], dnl -- ndbcluster requires partition to be enabled -MYSQL_CONFIGURE_PLUGINS([none]) +MYSQL_CONFIGURE_PLUGINS([default]) # Only build client code? AC_ARG_WITH(server, diff --git a/storage/innobase/plug.in b/storage/innobase/plug.in index 4ca1b520526..9367b70c52e 100644 --- a/storage/innobase/plug.in +++ b/storage/innobase/plug.in @@ -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]) |