Commit 83583111 authored Apr 13, 2006 by unknown

WL#3201

  " Configure support for server plugins "


storage/blackhole/ha_blackhole.h:
  Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h
BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad:
  Delete: config/ac-macros/storage.m4
BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294:
  Delete: config/ac-macros/ha_archive.m4
BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed:
  Delete: config/ac-macros/ha_blackhole.m4
BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708:
  Delete: config/ac-macros/ha_example.m4
BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6:
  Delete: config/ac-macros/ha_federated.m4
BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39:
  Delete: config/ac-macros/ha_innodb.m4
BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89:
  Delete: config/ac-macros/ha_partition.m4
BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca:
  Delete: config/ac-macros/ha_tina.m4
BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc:
  Delete: sql/handlerton.cc.in
BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc
BUILD/SETUP.sh:
  WL#3201
    Changes in configure arguments
Makefile.am:
  WL#3201
    changes in build subst names
config/ac-macros/ha_berkeley.m4:
  WL#3201
    remove unused variable
    Makefile is always made
config/ac-macros/ha_ndbcluster.m4:
  WL#3201
    remove unused variables
    Split big macro
configure.in:
  WL#3201
    out with storage.m4, in with plugins.m4
    change how plugins are declared
    include makefiles, remove handlerton.cc, add sql_builtin.cc
include/mysql/plugin.h:
  WL#3201
    support static and dynamic build - MYSQL_DYNAMIC_PLUGIN
libmysqld/Makefile.am:
  WL#3201
    Storage engine files still left in sql subdir are not conditionally
    compiled. Should move them out soon,
plugin/Makefile.am:
  WL#3201
    update makefile
plugin/fulltext/Makefile.am:
  WL#3201
    update makefile
plugin/fulltext/plugin_example.c:
  WL#3201
    change to mysql_declare_plugin macro
sql/Makefile.am:
  WL#3201
    Storage engine files still left in sql subdir are not conditionally
    compiled. Should move them out soon,
sql/ha_berkeley.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_federated.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_heap.cc:
  WL#3201
    make into a plugin
sql/ha_innodb.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_myisam.cc:
  WL#3201
    make into a plugin
sql/ha_myisammrg.cc:
  WL#3201
    make into a plugin
sql/ha_ndbcluster.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_ndbcluster_binlog.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_partition.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/handler.cc:
  WL#3201
    Simplify how storage engines are found by db_type
    (hopefully we can get rid of it soon)
    Code cleanup
sql/handler.h:
  WL#3201
    new DB_TYPE_FIRST_DYNAMIC
    new func ha_finalize_handlerton()
    remove ha_register_builtin_plugins()
sql/log.cc:
  WL#3201
    make into a plugin
sql/mysqld.cc:
  WL#3201
    remove ha_register_builtin_plugins()
    alter init order so that storage engines are initialized before first use
sql/partition_info.cc:
  WL#3201
    conditionally compile content
sql/sql_delete.cc:
  WL#3201
    conditionally include ha_innodb.h
sql/sql_plugin.cc:
  WL#3201
    All compiled in plugins are in mysqld_builtins[]
    add funcs for plugin finalization
    install builtin plugins on initialization
sql/sql_show.cc:
  WL#3201
    Fix to use plugin_foreach()
sql/sql_yacc.yy:
  WL#3201
    SHOW FULL PLUGIN
storage/archive/Makefile.am:
  WL#3201
    setup as plugin makefile
storage/archive/ha_archive.cc:
  WL#3201
    Convert into a plugin
storage/archive/ha_archive.h:
  WL#3201
    azlib.h now in local dir
storage/blackhole/ha_blackhole.cc:
  WL#3201
    convert into a plugin
storage/csv/Makefile.am:
  WL#3201
    setup as plugin makefile
storage/csv/ha_tina.cc:
  WL#3201
    remove conditional compilation on MYSQL_PLUGIN
    mysql_declare_plugin macro change
storage/example/Makefile.am:
  WL#3201
    fix as new-style plugin makefile
storage/example/ha_example.cc:
  WL#3201
    remove conditional compilation on MYSQL_PLUGIN
    mysql_declare_plugin macro change
storage/innobase/Makefile.am:
  WL#3201
    Lets make life easier and reduce innodb into a single library file
config/ac-macros/plugins.m4:
  New BitKeeper file ``config/ac-macros/plugins.m4''
sql/sql_builtin.cc.in:
  New BitKeeper file ``sql/sql_builtin.cc.in''
storage/blackhole/Makefile.am:
  New BitKeeper file ``storage/blackhole/Makefile.am''

parent 087cae1a

BUILD/SETUP.sh

+3 −12

Original line number	Diff line number	Diff line
		@@ -146,18 +146,9 @@ static_link="$static_link --with-client-ldflags=-all-static"
		local_infile_configs="--enable-local-infile"


		max_configs="--with-innodb --with-berkeley-db"
		max_configs="$max_configs --with-archive-storage-engine"
		max_configs="$max_configs --with-big-tables"
		max_configs="$max_configs --with-blackhole-storage-engine"
		max_configs="$max_configs --with-federated-storage-engine"
		max_configs="$max_configs --with-csv-storage-engine"
		max_configs="$max_configs --with-example-storage-engine"
		max_configs="$max_configs --with-partition $SSL_LIBRARY"

		max_no_embedded_configs="$max_configs --with-ndbcluster"
		max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server"
		max_configs="$max_configs --with-ndbcluster --with-embedded-server"
		max_no_embedded_configs="$SSL_LIBRARY --with-modules=max"
		max_no_ndb_configs="$SSL_LIBRARY --with-modules=max-no-ndb --with-embedded-server"
		max_configs="$SSL_LIBRARY --with-modules=max --with-embedded-server"

		#
		# CPU and platform specific compilation flags.

Makefile.am

+1 −2

Original line number	Diff line number	Diff line
		@@ -24,9 +24,8 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
		SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
		@readline_topdir@ sql-common \
		@thread_dirs@ pstack \
		@sql_union_dirs@ @mysql_se_dirs@ \
		@sql_union_dirs@ @mysql_plugin_dirs@ \
		@sql_server@ scripts @man_dirs@ tests \
		@mysql_se_plugins@ \
		netware @libmysqld_dirs@ \
		@bench_dirs@ support-files @tools_dirs@ \
		plugin win

config/ac-macros/ha_archive.m4

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		dnl ---------------------------------------------------------------------------
		dnl Macro: MYSQL_CHECK_ARCHIVEDB
		dnl Sets HAVE_ARCHIVE_DB if --with-archive-storage-engine is used
		dnl ---------------------------------------------------------------------------
		AC_DEFUN([MYSQL_CHECK_ARCHIVEDB], [
		AC_ARG_WITH([archive-storage-engine],
		[
		--with-archive-storage-engine
		Enable the Archive Storage Engine],
		[archivedb="$withval"],
		[archivedb=no])
		AC_MSG_CHECKING([for archive storage engine])

		case "$archivedb" in
		yes )
		AC_DEFINE([HAVE_ARCHIVE_DB], [1], [Builds Archive Storage Engine])
		AC_MSG_RESULT([yes])
		[archivedb=yes]
		;;
		* )
		AC_MSG_RESULT([no])
		[archivedb=no]
		;;
		esac

		])
		dnl ---------------------------------------------------------------------------
		dnl END OF MYSQL_CHECK_ARCHIVE SECTION
		dnl ---------------------------------------------------------------------------

config/ac-macros/ha_berkeley.m4

+0 −3

Original line number	Diff line number	Diff line
		@@ -120,12 +120,9 @@ 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)
		AC_CONFIG_FILES(storage/bdb/Makefile)
		])

		AC_DEFUN([MYSQL_CHECK_INSTALLED_BDB], [

config/ac-macros/ha_blackhole.m4

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		dnl ---------------------------------------------------------------------------
		dnl Macro: MYSQL_CHECK_BLACKHOLEDB
		dnl Sets HAVE_BLACKHOLE_DB if --with-blackhole-storage-engine is used
		dnl ---------------------------------------------------------------------------
		AC_DEFUN([MYSQL_CHECK_BLACKHOLEDB], [
		AC_ARG_WITH([blackhole-storage-engine],
		[
		--with-blackhole-storage-engine
		Enable the Blackhole Storage Engine],
		[blackholedb="$withval"],
		[blackholedb=no])
		AC_MSG_CHECKING([for blackhole storage engine])

		case "$blackholedb" in
		yes )
		AC_DEFINE([HAVE_BLACKHOLE_DB], [1], [Builds Blackhole Storage Engine])
		AC_MSG_RESULT([yes])
		[blackholedb=yes]
		;;
		* )
		AC_MSG_RESULT([no])
		[blackholedb=no]
		;;
		esac

		])
		dnl ---------------------------------------------------------------------------
		dnl END OF MYSQL_CHECK_BLACKHOLE SECTION
		dnl ---------------------------------------------------------------------------