Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2329 06/04/13 03:13:41 acurtis@stripped +11 -0
WL#3201 (part2)
" Configure support for server plugins "
tidyups and fixes found after testing
storage/example/Makefile.am
1.7 06/04/13 03:13:31 acurtis@stripped +21 -9
WL#3201
fixes
storage/blackhole/Makefile.am
1.2 06/04/13 03:13:31 acurtis@stripped +1 -1
WL#3201
fixes
storage/bdb/Makefile.in
1.12 06/04/13 03:13:31 acurtis@stripped +3 -12
WL#3201
undo previous cset
storage/archive/Makefile.am
1.5 06/04/13 03:13:31 acurtis@stripped +1 -1
WL#3201
fixes
sql/Makefile.am
1.137 06/04/13 03:13:31 acurtis@stripped +13 -14
WL#3201
tidyup
plugin/fulltext/Makefile.am
1.6 06/04/13 03:13:30 acurtis@stripped +1 -1
WL#3201
fixes
libmysqld/Makefile.am
1.85 06/04/13 03:13:30 acurtis@stripped +8 -12
WL#3201
tidyup
configure.in
1.361 06/04/13 03:13:30 acurtis@stripped +26 -7
WL#3201
include MyISAM, MyISAMMRG and HEAP storage engines
tidyup and fixes
config/ac-macros/plugins.m4
1.2 06/04/13 03:13:30 acurtis@stripped +92 -43
WL#3201
implement simple plugin dependency control
cleanup and fixes
config/ac-macros/ha_ndbcluster.m4
1.15 06/04/13 03:13:30 acurtis@stripped +4 -3
WL#3201
cleanup
config/ac-macros/ha_berkeley.m4
1.6 06/04/13 03:13:30 acurtis@stripped +0 -2
WL#3201
cleanup
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: acurtis
# Host: localhost.(none)
# Root: /home/antony/work2/wl3201.4
--- 1.360/configure.in 2006-04-12 22:02:25 -07:00
+++ 1.361/configure.in 2006-04-13 03:13:30 -07:00
@@ -61,7 +61,7 @@ MYSQL_MODULE_DYNAMIC(archive, [ha_arch
MYSQL_STORAGE_ENGINE(berkeley, [BerkeleyDB Storage Engine],
[Transactional Tables using BerkeleyDB], [max,max-no-ndb])
MYSQL_MODULE_DIRECTORY(berkeley,[storage/bdb])
-MYSQL_MODULE_STATIC(berkeley, [libdb.a])
+MYSQL_MODULE_STATIC(berkeley, [[\$(bdb_libs_with_path)]])
MYSQL_MODULE_ACTIONS(berkeley, [MYSQL_SETUP_BERKELEY_DB])
MYSQL_STORAGE_ENGINE(blackhole, [Blackhole Storage Engine],
@@ -90,6 +90,11 @@ MYSQL_MODULE_DIRECTORY(ftexample, [plugi
MYSQL_MODULE_STATIC(ftexample, [libftexample.a])
MYSQL_MODULE_DYNAMIC(ftexample, [ft_example.la])
+MYSQL_STORAGE_ENGINE(heap, [Memory Storage Engine],
+ [In memory hashed tables])
+MYSQL_MODULE_DIRECTORY(heap, [storage/heap])
+MYSQL_MODULE_STATIC(heap, [libheap.a])
+
MYSQL_STORAGE_ENGINE(innobase, [InnoDB Storage Engine],
[Transactional Tables using InnoDB], [max,max-no-ndb])
MYSQL_MODULE_DIRECTORY(innobase, [storage/innobase])
@@ -102,19 +107,32 @@ MYSQL_MODULE_ACTIONS(innobase, [
other_configures="$other_configures storage/innobase/configure"
])
+MYSQL_STORAGE_ENGINE(myisam, [MyISAM Storage Engine],
+ [Traditional non-transactional MySQL tables])
+MYSQL_MODULE_DIRECTORY(myisam, [storage/myisam])
+MYSQL_MODULE_STATIC(myisam, [libmyisam.a])
+
+MYSQL_STORAGE_ENGINE(myisammrg, [MyISAM MERGE Engine],
+ [Merge multiple MySQL tables into one])
+MYSQL_MODULE_DIRECTORY(myisammrg,[storage/myisammrg])
+MYSQL_MODULE_STATIC(myisammrg, [libmyisammrg.a])
+
MYSQL_STORAGE_ENGINE(ndbcluster, [Cluster Storage Engine],
[High Availability Clustered tables], [max])
-MYSQL_MODULE_DIRECTORY(ndbcluster, [storage/ndb])
-MYSQL_MODULE_STATIC(ndbcluster, [libndb.a])
-MYSQL_MODULE_ACTIONS(ndbcluster, [MYSQL_SETUP_NDBCLUSTER])
+MYSQL_MODULE_DIRECTORY(ndbcluster,[storage/ndb])
+MYSQL_MODULE_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
+MYSQL_MODULE_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
MYSQL_STORAGE_ENGINE(partition, [Partition Engine],
[MySQL Table Partitioning Engine], [max,max-no-ndb])
-MYSQL_MODULE_MANDATORY(csv) dnl Used for logging
+MYSQL_MODULE_MANDATORY(csv) dnl Used for logging
+MYSQL_MODULE_MANDATORY(heap) dnl Memory tables
+MYSQL_MODULE_MANDATORY(myisam) dnl Default
+MYSQL_MODULE_MANDATORY(myisammrg)
dnl -- ndbcluster requires partition to be enabled
-MYSQL_MODULE_DEPENDS(ndbcluster,[partition])
+MYSQL_MODULE_DEPENDS(ndbcluster, partition)
#####
#####
@@ -2549,7 +2567,6 @@ then
AC_SUBST(THREAD_LOBJECTS)
server_scripts="mysqld_safe mysql_install_db"
sql_server_dirs="strings mysys dbug extra regex"
- mysql_plugin_dirs="storage/myisam storage/myisammrg storage/heap $mysql_plugin_dirs"
sql_server="$sql_server vio sql"
fi
@@ -2606,6 +2623,8 @@ for CONF in $other_configures; do
done
AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
+
+NDBCLUSTER_CONFIG_FILES
# Output results
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
--- 1.136/sql/Makefile.am 2006-04-12 22:02:25 -07:00
+++ 1.137/sql/Makefile.am 2006-04-13 03:13:31 -07:00
@@ -30,10 +30,7 @@ libexec_PROGRAMS = mysqld
noinst_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
-LDADD = $(top_builddir)/storage/myisam/libmyisam.a \
- $(top_builddir)/storage/myisammrg/libmyisammrg.a \
- $(top_builddir)/storage/heap/libheap.a \
- $(top_builddir)/vio/libvio.a \
+LDADD = $(top_builddir)/vio/libvio.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/regex/libregex.a \
@@ -53,6 +50,9 @@ noinst_HEADERS = item.h item_func.h item
sql_manager.h sql_map.h sql_string.h unireg.h \
sql_error.h field.h handler.h mysqld_suffix.h \
ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \
+ ha_innodb.h ha_berkeley.h ha_federated.h \
+ ha_ndbcluster.h ha_ndbcluster_binlog.h \
+ ha_ndbcluster_tables.h
opt_range.h protocol.h rpl_tblmap.h \
log.h sql_show.h rpl_rli.h \
sql_select.h structs.h table.h sql_udf.h hash_filo.h\
@@ -61,15 +61,12 @@ noinst_HEADERS = item.h item_func.h item
rpl_injector.h \
stacktrace.h sql_sort.h sql_cache.h set_var.h \
spatial.h gstream.h client_settings.h tzfile.h \
- tztime.h my_decimal.h\
+ tztime.h my_decimal.h\
sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
parse_file.h sql_view.h sql_trigger.h \
sql_array.h sql_cursor.h event.h event_priv.h \
sql_plugin.h authors.h sql_partition.h \
- partition_info.h partition_element.h \
- ha_partition.h ha_innodb.h ha_berkeley.h \
- ha_federated.h ha_ndbcluster.h \
- ha_ndbcluster_binlog.h ha_ndbcluster_tables.h
+ partition_info.h partition_element.h
mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \
item.cc item_sum.cc item_buff.cc item_func.cc \
item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
@@ -82,7 +79,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
mysqld.cc password.c hash_filo.cc hostname.cc \
set_var.cc sql_parse.cc sql_yacc.yy \
sql_base.cc table.cc sql_select.cc sql_insert.cc \
- sql_prepare.cc sql_error.cc \
+ sql_prepare.cc sql_error.cc \
sql_update.cc sql_delete.cc uniques.cc sql_do.cc \
procedure.cc item_uniq.cc sql_test.cc \
log.cc log_event.cc init.cc derror.cc sql_acl.cc \
@@ -90,6 +87,9 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
discover.cc time.cc opt_range.cc opt_sum.cc \
records.cc filesort.cc handler.cc \
ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
+ ha_partition.cc ha_innodb.cc ha_berkeley.cc \
+ ha_federated.cc \
+ ha_ndbcluster.cc ha_ndbcluster_binlog.cc \
sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
@@ -105,9 +105,8 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
sp_cache.cc parse_file.cc sql_trigger.cc \
event_executor.cc event.cc event_timed.cc \
sql_plugin.cc sql_binlog.cc \
- sql_builtin.cc sql_tablespace.cc partition_info.cc \
- ha_partition.cc ha_innodb.cc ha_berkeley.cc \
- ha_federated.cc ha_ndbcluster.cc ha_ndbcluster_binlog.cc
+ sql_builtin.cc sql_tablespace.cc partition_info.cc
+
gen_lex_hash_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
@@ -160,7 +159,7 @@ sql_yacc.o: sql_yacc.cc sql_yacc.h $(HEA
lex_hash.h: gen_lex_hash$(EXEEXT)
./gen_lex_hash$(EXEEXT) > $@
-# the following will eventually be moved out of this directory
+# the following three should eventually be moved out of this directory
ha_berkeley.o: ha_berkeley.cc ha_berkeley.h
$(CXXCOMPILE) @bdb_includes@ $(LM_CFLAGS) -c $<
--- 1.1/config/ac-macros/plugins.m4 2006-04-12 22:02:27 -07:00
+++ 1.2/config/ac-macros/plugins.m4 2006-04-13 03:13:30 -07:00
@@ -169,7 +169,10 @@ dnl ------------------------------------
dnl Macro: MYSQL_MODULE_DEPENDS
dnl
dnl What it does:
-dnl
+dnl Enables other modules neccessary for this module
+dnl Dependency checking is not recursive so if any
+dnl required module requires further modules, list them
+dnl here too!
dnl
dnl ---------------------------------------------------------------------------
@@ -187,7 +190,7 @@ AC_DEFUN([MYSQL_MODULE_DEPENDS],[ dnl
AC_DEFUN([_MYSQL_MODULE_DEPEND],[ dnl
REQUIRE_PLUGIN([$2]) dnl
- dnl do some more stuff here,
+ _MYSQL_PLUGAPPEND([__mysql_plugdepends_$1__],[$2]) dnl
])
@@ -231,9 +234,9 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ dnl
AC_DEFUN([_MYSQL_CONFIGURE_PLUGINS],[ dnl
ifelse($#, 0, [], $#, 1, [ dnl
- _MYSQL_CHECK_PLUGIN([$1])
+ _MYSQL_CHECK_PLUGIN([$1]) dnl
],[ dnl
- _MYSQL_CHECK_PLUGIN([$1])
+ _MYSQL_CHECK_PLUGIN([$1]) dnl
_MYSQL_CONFIGURE_PLUGINS(m4_shift($@)) dnl
])
])
@@ -258,15 +261,20 @@ AC_DEFUN([_DO_MYSQL_CHECK_PLUGIN],[ dnl
m4_ifdef([$5],[ dnl
AH_TEMPLATE($5, [Include ]$4[ into mysqld])
])
- AC_MSG_CHECKING([whether to use ]$3)
- m4_ifdef([$10],[ dnl
- AC_MSG_RESULT([disabled])
+ AC_MSG_CHECKING([whether to use ]$3) dnl
+ m4_ifdef([$10],[
+ if test "[$mysql_module_]m4_bpatsubst([$1], -, _)" == "yes" -a \
+ "[$with_module_]m4_bpatsubst([$1], -, _)" != "no" -o \
+ "[$with_module_]m4_bpatsubst([$1], -, _)" == "yes"; then
+ AC_MSG_ERROR([disabled])
+ fi
+ AC_MSG_RESULT([no]) dnl
],[ dnl
- m4_ifdef([$9],[ dnl
+ m4_ifdef([$9],[
if test "[$with_module_]m4_bpatsubst([$1], -, _)" == "no"; then
AC_MSG_ERROR([cannot disable mandatory module])
fi
- [mysql_module_]m4_bpatsubst([$1], -, _)="yes"
+ [mysql_module_]m4_bpatsubst([$1], -, _)="yes" dnl
])
if test "[$with_module_]m4_bpatsubst([$1], -, _)" != "no"; then
if test "[$mysql_module_]m4_bpatsubst([$1], -, _)" != "yes" -a \
@@ -277,41 +285,46 @@ AC_DEFUN([_DO_MYSQL_CHECK_PLUGIN],[ dnl
])
AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], "$8")
AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_static_target], [""])
- [with_module_]m4_bpatsubst([$1], -, _)="yes"
- ],[ dnl
+ [with_module_]m4_bpatsubst([$1], -, _)="yes" dnl
+ ],[
AC_MSG_RESULT([cannot build dynamically])
- [with_module_]m4_bpatsubst([$1], -, _)="no"
+ [with_module_]m4_bpatsubst([$1], -, _)="no" dnl
])
- else
- m4_ifdef([$7],[ dnl
- ifelse(m4_bregexp($7,[^lib[^.]\.\(a\|la\|so\)]), -1, [ dnl
+ else dnl
+ m4_ifdef([$7],[
+ ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [ dnl
m4_ifdef([$6],[
mysql_plugin_dirs="$mysql_plugin_dirs $6"
- mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/$6/$7" dnl
- ],[ dnl
- mysql_plugin_libs="$mysql_plugin_libs $7"
+ mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6" dnl
])
- ],[ dnl
+ mysql_plugin_libs="$mysql_plugin_libs dnl
+[-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])" dnl
+ ], m4_bregexp($7, [^\\\$]), 0, [ dnl
m4_ifdef([$6],[
- mysql_plugin_dirs="$mysql_plugin_dirs $6"
- mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6" dnl
+ mysql_plugin_dirs="$mysql_plugin_dirs $6" dnl
])
- mysql_plugin_libs="$mysql_plugin_libs [-l]m4_bregexp($7,
- [^lib\([^.]\)\.\(a\|la\|so\)],[\1])"
- ])
- m4_ifdef([$5],[ dnl
+ mysql_plugin_libs="$mysql_plugin_libs $7" dnl
+ ], [ dnl
+ m4_ifdef([$6],[
+ mysql_plugin_dirs="$mysql_plugin_dirs $6"
+ mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/$6/$7" dnl
+ ],[
+ mysql_plugin_libs="$mysql_plugin_libs $7" dnl
+ ]) dnl
+ ]) dnl
+ m4_ifdef([$5],[
AC_DEFINE($5) dnl
])
AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_static_target], "$7")
- AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], [""])
+ AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], [""]) dnl
],[ dnl
- m4_ifdef([$6],[ dnl
- AC_FATAL([plugin directory specified without library for ]$3)
+ m4_ifdef([$6],[
+ AC_FATAL([plugin directory specified without library for ]$3) dnl
],[ dnl
m4_ifdef([$5],[
AC_DEFINE($5)
AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_static_target], ["yes"])
- AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], [""])
+ AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], [""]) dnl
]) dnl
]) dnl
])
@@ -331,7 +344,7 @@ AC_DEFUN([_DO_MYSQL_CHECK_PLUGIN],[ dnl
AC_MSG_ERROR([thats strange])
fi
$11
- fi
+ fi dnl
]) dnl
])
@@ -368,11 +381,11 @@ _MYSQL_MODULE_META_CHECK(m4_shift($@))])
])
AC_DEFUN([_MYSQL_CHECK_PLUGIN_META], [
- elif test "$with_modules" == "[$1]"; then dnl
+ elif test "$mysql_modules" == "[$1]"; then dnl
m4_ifdef([$2], [
- with_modules="m4_bpatsubst($2, :, [,])" dnl
+ mysql_modules="m4_bpatsubst($2, :, [,])" dnl
],[
- with_modules="" dnl
+ mysql_modules="" dnl
]) dnl
])
@@ -497,7 +510,42 @@ m4_ifdef([$2],[
]) dnl
])
-AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[ dnl
+AC_DEFUN([_MYSQL_CHECK_DEPENDENCIES], [ dnl
+ ifelse($#, 0, [], $#, 1, [ dnl
+ _MYSQL_CHECK_DEPENDS([$1],[__mysql_plugdepends_$1__]) dnl
+ ],[ dnl
+ _MYSQL_CHECK_DEPENDS([$1],[__mysql_plugdepends_$1__]) dnl
+ _MYSQL_CHECK_DEPENDENCIES(m4_shift($@)) dnl
+ ]) dnl
+])
+
+AC_DEFUN([_MYSQL_CHECK_DEPENDS], [ dnl
+ m4_ifdef([$2], [
+ if test "[$mysql_module_]m4_bpatsubst([$1], -, _)" == "yes" -a \
+ "[$with_module_]m4_bpatsubst([$1], -, _)" != "no" -o \
+ "[$with_module_]m4_bpatsubst([$1], -, _)" == "yes"; then dnl
+ _MYSQL_GEN_DEPENDS(m4_bpatsubst($2, :, [,]))
+ fi
+ ]) dnl
+])
+
+AC_DEFUN([_MYSQL_GEN_DEPENDS], [ dnl
+ ifelse($#, 0, [], $#, 1, [
+ [mysql_module_]m4_bpatsubst([$1], -, _)="yes"
+ if test "[$with_module_]m4_bpatsubst([$1], -, _)" == "no"; then
+ AC_MSG_ERROR([depends upon disabled module $1])
+ fi dnl
+ ],[
+ [mysql_module_]m4_bpatsubst([$1], -, _)="yes"
+ if test "[$with_module_]m4_bpatsubst([$1], -, _)" == "no"; then
+ AC_MSG_ERROR([depends upon disabled module $1])
+ fi dnl
+ _MYSQL_GEN_DEPENDS(m4_shift($@)) dnl
+ ]) dnl
+])
+
+
+AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[
AC_ARG_WITH([modules],
[ --with-modules=PLUGIN[[,PLUGIN...]]
Select plugin modules for linking into mysqld
@@ -508,27 +556,28 @@ AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[ dn
[m4_bpatsubst(none:all:__mysql_metaplugin_list__, :, [, ])], dnl
[none, all])
Available plugin modules are:
- m4_indir([MYSQL_LIST_PLUGINS])],[], [ with_modules=['$1']])
+ m4_indir([MYSQL_LIST_PLUGINS])], [mysql_modules="$withval"], dnl
+ [mysql_modules=['$1']]) dnl
- AC_MSG_CHECKING([requested plugin modules to configure])
- if test "$with_modules" == "all"; then
- with_modules="m4_bpatsubst(__mysql_plugin_list__, :, [,])"
- elif test "$with_modules" == "none"; then
- with_modules="" dnl
+ if test "$mysql_modules" == "all"; then
+ mysql_modules="m4_bpatsubst(__mysql_plugin_list__, :, [,])"
+ elif test "$mysql_modules" == "none"; then
+ mysql_modules="" dnl
m4_ifdef([__mysql_metaplugin_list__],[ dnl
_MYSQL_MODULE_META_CHECK(m4_bpatsubst(__mysql_metaplugin_list__, :, [,])) dnl
])
fi
- AC_MSG_RESULT(["$with_modules"])
- for plugin in `echo $with_modules | tr ",.:;" " "`; do
+ for plugin in `echo $mysql_modules | tr ",.:;" " "`; do
if test "$plugin" == "all" -o "$plugin" == "none"; then
AC_MSG_ERROR([bad module name: $plugin]) dnl
_MYSQL_MODULE_ARGS_CHECK(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
else
AC_MSG_ERROR([unknown plugin module: $plugin])
fi
- done
+ done
+
+ _MYSQL_CHECK_DEPENDENCIES(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
])
--- 1.1/storage/blackhole/Makefile.am 2006-04-12 22:02:27 -07:00
+++ 1.2/storage/blackhole/Makefile.am 2006-04-13 03:13:31 -07:00
@@ -36,7 +36,7 @@ EXTRA_LTLIBRARIES = ha_blackhole.la
pkglib_LTLIBRARIES = @plugin_blackhole_shared_target@
ha_blackhole_la_LDFLAGS=-module -rpath $(MYSQLLIBdir)
ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_blackhole_la_CFLAGS= $(AM_CFLAGS)
+ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_blackhole_la_SOURCES=ha_blackhole.cc
--- 1.6/storage/example/Makefile.am 2006-03-29 17:31:54 -08:00
+++ 1.7/storage/example/Makefile.am 2006-04-13 03:13:31 -07:00
@@ -1,15 +1,15 @@
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -26,14 +26,26 @@ INCLUDES = -I$(top_srcdir)/
-I$(srcdir)
WRAPLIBS=
-pkglib_LIBRARIES = libexample.a
-
-noinst_HEADERS = ha_example.h
-libexample_a_SOURCES = ha_example.cc
-EXTRA_DIST = cmakelists.txt
LDADD =
-DEFS = -DMYSQL_SERVER @DEFS@
+DEFS = @DEFS@
+
+noinst_HEADERS = ha_example.h
+
+EXTRA_LTLIBRARIES = ha_example.la
+pkglib_LTLIBRARIES = @plugin_example_shared_target@
+ha_example_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
+ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_example_la_SOURCES = ha_example.cc
+
+
+EXTRA_LIBRARIES = libexample.a
+noinst_LIBRARIES = @plugin_example_static_target@
+libexample_a_CXXFLAGS = $(AM_CFLAGS)
+libexample_a_CFLAGS = $(AM_CFLAGS)
+libexample_a_SOURCES= ha_example.cc
+
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.5/config/ac-macros/ha_berkeley.m4 2006-04-12 22:02:25 -07:00
+++ 1.6/config/ac-macros/ha_berkeley.m4 2006-04-13 03:13:30 -07:00
@@ -120,8 +120,6 @@ AC_DEFUN([MYSQL_SETUP_BERKELEY_DB], [
sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \
AC_MSG_ERROR([could not configure Berkeley DB])
- mysql_se_libs="$mysql_se_libs $bdb_libs_with_path"
-
AC_SUBST(bdb_includes)
AC_SUBST(bdb_libs)
AC_SUBST(bdb_libs_with_path)
--- 1.14/config/ac-macros/ha_ndbcluster.m4 2006-04-12 22:02:25 -07:00
+++ 1.15/config/ac-macros/ha_ndbcluster.m4 2006-04-13 03:13:30 -07:00
@@ -191,7 +191,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
ndbcluster_system_libs=""
ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"
- mysql_se_objs="$mysql_se_objs ha_ndbcluster_binlog.o"
MYSQL_CHECK_NDB_OPTIONS
NDBCLUSTER_WORKAROUNDS
@@ -282,8 +281,9 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
ndb_bin_am_ldflags=""
fi
- mysql_se_libs="$mysql_se_libs $ndbcluster_libs $ndbcluster_system_libs"
- mysql_se_libs="$mysql_se_libs $NDB_SCI_LIBS"
+ dnl mysql_plugin_libs="$mysql_plugin_libs $ndbcluster_libs"
+ dnl mysql_plugin_libs="$mysql_plugin_libs $ndbcluster_system_libs"
+ dnl mysql_plugin_libs="$mysql_plugin_libs $NDB_SCI_LIBS"
AC_SUBST(NDB_VERSION_MAJOR)
AC_SUBST(NDB_VERSION_MINOR)
@@ -302,6 +302,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
AC_SUBST(ndbcluster_libs)
AC_SUBST(ndbcluster_system_libs)
AC_SUBST(ndb_mgmclient_libs)
+ AC_SUBST(NDB_SCI_LIBS)
AC_SUBST(ndb_transporter_opt_objs)
AC_SUBST(ndb_port)
--- 1.4/storage/archive/Makefile.am 2006-04-12 22:02:27 -07:00
+++ 1.5/storage/archive/Makefile.am 2006-04-13 03:13:31 -07:00
@@ -37,7 +37,7 @@ EXTRA_LTLIBRARIES = ha_archive.la
pkglib_LTLIBRARIES = @plugin_archive_shared_target@
ha_archive_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_archive_la_CFLAGS = $(AM_CFLAGS)
+ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_archive_la_SOURCES = ha_archive.cc azio.c
--- 1.84/libmysqld/Makefile.am 2006-04-12 22:02:25 -07:00
+++ 1.85/libmysqld/Makefile.am 2006-04-13 03:13:30 -07:00
@@ -44,7 +44,10 @@ libmysqlsources = errmsg.c get_password.
noinst_HEADERS = embedded_priv.h emb_qcache.h
sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
- ha_heap.cc ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \
+ ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
+ ha_innodb.cc ha_berkeley.cc ha_federated.cc ha_ndbcluster.cc \
+ ha_ndbcluster_binlog.cc ha_partition.cc \
+ handler.cc sql_handler.cc \
hostname.cc init.cc password.c \
item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
@@ -65,14 +68,10 @@ sqlsources = derror.cc field.cc field_co
spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
- event_executor.cc event.cc event_timed.cc \
- rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
- sql_tablespace.cc \
- rpl_injector.cc my_user.c partition_info.cc \
- ha_innodb.cc ha_berkeley.cc \
- ha_federated.cc ha_ndbcluster.cc \
- ha_ndbcluster_binlog.cc \
- ha_partition.cc
+ event_executor.cc event.cc event_timed.cc \
+ rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \
+ sql_tablespace.cc \
+ rpl_injector.cc my_user.c partition_info.cc
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
libmysqld_a_SOURCES=
@@ -84,9 +83,6 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sq
# The following libraries should be included in libmysqld.a
INC_LIB= $(top_builddir)/regex/libregex.a \
- $(top_builddir)/storage/myisam/libmyisam.a \
- $(top_builddir)/storage/myisammrg/libmyisammrg.a \
- $(top_builddir)/storage/heap/libheap.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
--- 1.5/plugin/fulltext/Makefile.am 2006-04-12 22:02:25 -07:00
+++ 1.6/plugin/fulltext/Makefile.am 2006-04-13 03:13:30 -07:00
@@ -29,7 +29,7 @@ EXTRA_LTLIBRARIES = ft_example.la
pkglib_LTLIBRARIES = @plugin_ftexample_shared_target@
ft_example_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
ft_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ft_example_la_CFLAGS= $(AM_CFLAGS)
+ft_example_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ft_example_la_SOURCES = plugin_example.c
--- 1.11/storage/bdb/Makefile.in 2006-04-12 22:02:27 -07:00
+++ 1.12/storage/bdb/Makefile.in 2006-04-13 03:13:31 -07:00
@@ -19,9 +19,6 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-bdb_libs_with_path = @bdb_libs_with_path@
-plugin_berkeley_static_target = @plugin_berkeley_static_target@
-LN = @LN@
# distdir and top_distdir are set by the calling Makefile
@@ -36,20 +33,14 @@ subdirs = btree build_win32 clib common
@SET_MAKE@
-all: @plugin_berkeley_static_target@
-
-libdb.a:
+all:
cd $(bdb_build) && $(MAKE) all
- rm -f $(srcdir)/libdb.a
- $(LN) -sf $(top_srcdir)/$(bdb_libs_with_path) $(srcdir)/libdb.a
clean:
- rm -f $(srcdir)/libdb.a
- -cd $(bdb_build) && $(MAKE) clean
+ cd $(bdb_build) && $(MAKE) clean
distclean:
- rm -f $(srcdir)/libdb.a
- -cd $(bdb_build) && $(MAKE) distclean
+ cd $(bdb_build) && $(MAKE) distclean
# May want to fix this, and MYSQL/configure, to install things
install dvi check installcheck:
| Thread |
|---|
| • bk commit into 5.1 tree (acurtis:1.2329) | antony | 13 Apr |
