remove unused autotools files

14 files changed, 0 insertions, 1249 deletions

diff --git a/storage/federatedx/Makefile.am b/storage/federatedx/Makefile.am
deleted file mode 100644
index 0e3249866ea..00000000000
--- a/storage/federatedx/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-# Used to build Makefile.in
-
-MYSQLDATAdir =          $(localstatedir)
-MYSQLSHAREdir =         $(pkgdatadir)
-MYSQLBASEdir=           $(prefix)
-MYSQLLIBdir=            $(pkglibdir)
-pkgplugindir =		$(pkglibdir)/plugin
-INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
-			-I$(top_srcdir)/regex \
-			-I$(top_srcdir)/sql \
-                        -I$(srcdir)
-WRAPLIBS=
-
-LDADD =
-
-DEFS =                  @DEFS@
-
-noinst_HEADERS =	ha_federatedx.h federatedx_probes.h
-
-EXTRA_LTLIBRARIES =	ha_federatedx.la
-pkgplugin_LTLIBRARIES =	@plugin_federatedx_shared_target@
-ha_federatedx_la_LDFLAGS =	-module -rpath $(pkgplugindir) \
-				-L$(top_builddir)/libservices -lmysqlservices
-ha_federatedx_la_CXXFLAGS=	-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_federatedx_la_CFLAGS =	-shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-
-
-EXTRA_LIBRARIES =	libfederatedx.a
-noinst_LIBRARIES =	@plugin_federatedx_static_target@
-libfederatedx_a_CXXFLAGS =	$(AM_CXXFLAGS)
-libfederatedx_a_SOURCES=	ha_federatedx.cc federatedx_txn.cc \
-			        federatedx_io.cc federatedx_io_null.cc \
-			        federatedx_io_mysql.cc
-
-EXTRA_DIST =		CMakeLists.txt plug.in ha_federatedx.h \
-			federatedx_probes.h
-
-ha_federatedx_la_SOURCES = ha_federatedx.cc federatedx_txn.cc \
-			   federatedx_io.cc federatedx_io_null.cc \
-			   federatedx_io_mysql.cc $(top_srcdir)/mysys/string.c
-ha_federatedx_la_LIBADD =
-
-#DTRACE =                @DTRACE@
-#DTRACEFLAGS =           @DTRACEFLAGS@
-#DTRACEFILES =           .libs/libfederatedx_engine_la-ha_federatedx.o
-
-# #if HAVE_DTRACE
-# #  libfederatedx_engine_la_LIBADD += federatedx_probes.o
-# #endif
-
-# federatedx_probes.h: federatedx_probes.d
-#	$(DTRACE) $(DTRACEFLAGS) -h -s federatedx_probes.d
-#	mv federatedx_probes.h federatedx_probes.h.bak
-#	sed "s/#include <unistd.h>//g" federatedx_probes.h.bak > federatedx_probes.h
-#	rm federatedx_probes.h.bak
-
-#federatedx_probes.o:
-#	$(DTRACE) $(DTRACEFLAGS) -G -s federatedx_probes.d $(DTRACEFILES)
-
-# End
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/maria/Makefile.am b/storage/maria/Makefile.am
deleted file mode 100644
index a83063a0226..00000000000
--- a/storage/maria/Makefile.am
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright (C) 2000-2008 MySQL 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; version 2 of the License.
-#
-# 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
-
-MYSQLDATAdir =          $(localstatedir)
-MYSQLSHAREdir =         $(pkgdatadir)
-MYSQLBASEdir=           $(prefix)
-MYSQLLIBdir=            $(pkglibdir)
-INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
-			-I$(top_srcdir)/regex \
-			-I$(top_srcdir)/sql \
-                        -I$(srcdir)
-WRAPLIBS=
-
-LDADD =
-
-DEFS =                  @DEFS@
-
-# "." is needed first because tests in unittest need libaria
-SUBDIRS =		. unittest
-
-EXTRA_DIST =		ma_test_all.sh ma_test_all.res ma_test_big.sh \
-			ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery
-pkgdata_DATA =		
-pkglib_LIBRARIES =	libaria.a
-bin_PROGRAMS =		aria_chk aria_pack aria_ftdump aria_read_log \
-			aria_dump_log
-aria_chk_DEPENDENCIES=	$(LIBRARIES)
-# Only reason to link with libmyisam.a here is that it's where some fulltext
-# pieces are (but soon we'll remove fulltext dependencies from Aria).
-# For now, it imposes that storage/myisam be built before storage/maria.
-aria_chk_SOURCES=	maria_chk.c
-aria_chk_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-aria_pack_SOURCES=	maria_pack.c
-aria_pack_DEPENDENCIES=$(LIBRARIES)
-aria_pack_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-aria_read_log_SOURCES=	maria_read_log.c
-aria_read_log_DEPENDENCIES=$(LIBRARIES)
-aria_read_log_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-aria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c
-aria_dump_log_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-                        $(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-aria_dump_log_SOURCES= 	ma_loghandler.c unittest/ma_loghandler_examples.c
-aria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG
-noinst_PROGRAMS =	ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test
-noinst_HEADERS =	maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
-			ma_sp_defs.h ma_fulltext.h ma_ftdefs.h ma_ft_test1.h \
-			ma_ft_eval.h trnman.h lockman.h tablockman.h \
-			ma_control_file.h ha_maria.h ma_blockrec.h \
-			ma_loghandler.h ma_loghandler_lsn.h ma_pagecache.h \
-			ma_checkpoint.h ma_recovery.h ma_commit.h ma_state.h \
-			trnman_public.h ma_check_standalone.h \
-			ma_key_recover.h ma_recovery_util.h \
-			ma_servicethread.h compat_aliases.h
-ma_test1_DEPENDENCIES=	$(LIBRARIES)
-ma_test1_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-ma_test2_DEPENDENCIES=	$(LIBRARIES)
-ma_test2_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-ma_test3_DEPENDENCIES=	$(LIBRARIES)
-ma_test3_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-#ma_ft_test1_DEPENDENCIES=	$(LIBRARIES)
-#ma_ft_eval_DEPENDENCIES=	$(LIBRARIES)
-aria_ftdump_SOURCES=	maria_ftdump.c
-aria_ftdump_DEPENDENCIES= $(LIBRARIES)
-aria_ftdump_LDADD=	@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-ma_rt_test_DEPENDENCIES=	$(LIBRARIES)
-ma_rt_test_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-ma_sp_test_DEPENDENCIES=	$(LIBRARIES)
-ma_sp_test_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-libaria_a_SOURCES =	ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
-			ma_rnext.c ma_rnext_same.c \
-			ma_search.c ma_page.c ma_key_recover.c ma_key.c \
-			ma_locking.c ma_state.c \
-			ma_rrnd.c ma_scan.c ma_cache.c \
-			ma_statrec.c ma_packrec.c ma_dynrec.c \
-			ma_blockrec.c ma_bitmap.c \
-			ma_update.c ma_write.c ma_unique.c \
-			ma_delete.c \
-			ma_rprev.c ma_rfirst.c ma_rlast.c ma_rsame.c \
-			ma_rsamepos.c ma_panic.c ma_close.c ma_create.c\
-			ma_range.c ma_dbug.c ma_checksum.c \
-			ma_changed.c ma_static.c ma_delete_all.c \
-			ma_delete_table.c ma_rename.c  ma_check.c \
-			ma_keycache.c ma_preload.c ma_ft_parser.c \
-			ma_ft_update.c ma_ft_boolean_search.c \
-			ma_ft_nlq_search.c ft_maria.c ma_sort.c \
-			trnman.c lockman.c tablockman.c \
-			ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c \
-			ma_sp_key.c ma_control_file.c ma_loghandler.c \
-			ma_pagecache.c ma_pagecaches.c \
-			ma_checkpoint.c ma_recovery.c ma_commit.c \
-			ma_pagecrc.c ma_recovery_util.c \
-			ha_maria.cc compat_aliases.cc ma_servicethread.c
-CLEANFILES =		test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? aria_log_control aria_log.0000*
-
-SUFFIXES = .sh
-
-.sh:
-	@RM@ -f $@ $@-t
-	@SED@ \
-	  -e 's!@''bindir''@!$(bindir)!g' \
-	  -e 's!@''scriptdir''@!$(bindir)!g' \
-	  -e 's!@''prefix''@!$(prefix)!g' \
-	  -e 's!@''datadir''@!$(datadir)!g' \
-	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
-	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
-	  -e 's!@''CC''@!@CC@!'\
-	  -e 's!@''CXX''@!@CXX@!'\
-	  -e 's!@''GXX''@!@GXX@!'\
-	  -e 's!@''PERL''@!@PERL@!' \
-	  -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
-	  -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
-	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
-	  -e 's!@''VERSION''@!@VERSION@!' \
-	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-	  -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
-	  -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
-	  -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
-	  -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
-	  -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
-	  -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
-	  -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
-	  -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
-	  -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
-	  -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
-	  -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
-	  -e 's!@''sysconfdir''@!@sysconfdir@!' \
-	  -e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
-	  -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
-	  -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
-	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
-	  -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
-	  -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
-	  -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
-	  -e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
-	$< > $@-t
-	@CHMOD@ +x $@-t
-	@MV@ $@-t $@
-
-tags:
-	etags *.h *.c *.cc
-
-unittests = unittest
-
-test:
-	perl $(top_srcdir)/unittest/unit.pl run $(unittests)
-
-test-verbose:
-	HARNESS_VERBOSE=1 perl $(top_srcdir)/unittest/unit.pl run $(unittests)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/maria/plug.in b/storage/maria/plug.in
deleted file mode 100644
index 00b974c356a..00000000000
--- a/storage/maria/plug.in
+++ /dev/null
@@ -1,19 +0,0 @@
-MYSQL_STORAGE_ENGINE(aria,, [Aria Storage Engine],
-        [Crash-safe tables with MyISAM heritage], [default,max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(aria,  [storage/maria])
-MYSQL_PLUGIN_STATIC(aria,     [libaria.a])
-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(aria, [ha_maria.cc])
-
-MYSQL_PLUGIN_ACTIONS(aria,  [
-# AC_CONFIG_FILES(storage/maria/unittest/Makefile)
-AC_ARG_WITH(aria-tmp-tables,
-    AC_HELP_STRING([--with-aria-tmp-tables],[Use Aria for internal temporary tables]),
-    [with_aria_tmp_tables=$withval],
-    [with_aria_tmp_tables=yes]
-)
-
-if test "$with_aria_tmp_tables" = "yes"
-then
-  AC_DEFINE([USE_ARIA_FOR_TMP_TABLES], [1], [Aria is used for internal temporary tables])
-fi
-])
diff --git a/storage/maria/unittest/Makefile.am b/storage/maria/unittest/Makefile.am
deleted file mode 100644
index b5bc8587066..00000000000
--- a/storage/maria/unittest/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright (C) 2006-2008 MySQL 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; version 2 of the License.
-#
-# 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
-
-AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-                  -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
-INCLUDES         = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
-                  -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
-EXTRA_DIST=	ma_test_all-t CMakeLists.txt \
-		ma_test_recovery.pl ma_test_recovery.expected
-# Only reason to link with libmyisam.a here is that it's where some fulltext
-# pieces are (but soon we'll remove fulltext dependencies from Aria).
-LDADD=			$(top_builddir)/unittest/mytap/libmytap.a \
-			$(top_builddir)/storage/maria/libaria.a \
-                        $(top_builddir)/storage/myisam/libmyisam.a \
-			$(top_builddir)/mysys/libmysys.a \
-			$(top_builddir)/dbug/libdbug.a \
-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
-noinst_PROGRAMS =	ma_control_file-t trnman-t \
-			ma_pagecache_single_1k-t ma_pagecache_single_8k-t \
-			ma_pagecache_single_64k-t \
-			ma_pagecache_consist_1k-t \
-			ma_pagecache_consist_64k-t \
-			ma_pagecache_consist_1kHC-t \
-			ma_pagecache_consist_64kHC-t \
-			ma_pagecache_consist_1kRD-t \
-			ma_pagecache_consist_64kRD-t \
-			ma_pagecache_consist_1kWR-t \
-			ma_pagecache_consist_64kWR-t \
-                        ma_pagecache_rwconsist_1k-t \
-                        ma_pagecache_rwconsist2_1k-t \
-			ma_test_loghandler-t \
-                        ma_test_loghandler_multigroup-t \
-			ma_test_loghandler_multithread-t \
-			ma_test_loghandler_multiflush-t \
-			ma_test_loghandler_pagecache-t \
-			ma_test_loghandler_long-t \
-			ma_test_loghandler_noflush-t \
-			ma_test_loghandler_first_lsn-t \
-                        ma_test_loghandler_max_lsn-t \
-                        ma_test_loghandler_purge-t \
-			ma_test_loghandler_readonly-t\
-                        ma_test_loghandler_nologs-t
-
-ma_test_loghandler_t_SOURCES = ma_test_loghandler-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_multigroup_t_SOURCES = ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c sequence_storage.c sequence_storage.h
-ma_test_loghandler_multithread_t_SOURCES = ma_test_loghandler_multithread-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_multiflush_t_SOURCES = ma_test_loghandler_multithread-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_multiflush_t_CPPFLAGS = -DMULTIFLUSH_TEST
-ma_test_loghandler_pagecache_t_SOURCES = ma_test_loghandler_pagecache-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_long_t_SOURCES = ma_test_loghandler-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_long_t_CPPFLAGS = -DLONG_LOG_TEST
-ma_test_loghandler_noflush_t_SOURCES = ma_test_loghandler_noflush-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_first_lsn_t_SOURCES = ma_test_loghandler_first_lsn-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_max_lsn_t_SOURCES = ma_test_loghandler_max_lsn-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_purge_t_SOURCES = ma_test_loghandler_purge-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_readonly_t_SOURCES = ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c sequence_storage.c sequence_storage.h
-ma_test_loghandler_readonly_t_CPPFLAGS = -DREADONLY_TEST
-ma_test_loghandler_nologs_t_SOURCES = ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-
-ma_pagecache_single_src =	ma_pagecache_single.c test_file.c test_file.h
-ma_pagecache_consist_src =	ma_pagecache_consist.c test_file.c test_file.h
-ma_pagecache_common_cppflags =	-DEXTRA_DEBUG -DPAGECACHE_DEBUG -DMAIN
-
-ma_pagecache_single_1k_t_SOURCES =	$(ma_pagecache_single_src)
-ma_pagecache_single_8k_t_SOURCES =	$(ma_pagecache_single_src)
-ma_pagecache_single_64k_t_SOURCES =	$(ma_pagecache_single_src)
-ma_pagecache_single_1k_t_CPPFLAGS = 	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=1024
-ma_pagecache_single_8k_t_CPPFLAGS = 	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=8192
-ma_pagecache_single_64k_t_CPPFLAGS =	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=65536 -DBIG
-
-ma_pagecache_consist_1k_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_1k_t_CPPFLAGS =	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=1024
-ma_pagecache_consist_64k_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_64k_t_CPPFLAGS = 	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=65536
-
-ma_pagecache_consist_1kHC_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_1kHC_t_CPPFLAGS = 	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=1024 -DTEST_HIGH_CONCURENCY
-ma_pagecache_consist_64kHC_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_64kHC_t_CPPFLAGS =	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=65536 -DTEST_HIGH_CONCURENCY
-
-ma_pagecache_consist_1kRD_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_1kRD_t_CPPFLAGS = 	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=1024 -DTEST_READERS
-ma_pagecache_consist_64kRD_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_64kRD_t_CPPFLAGS =	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=65536 -DTEST_READERS
-
-ma_pagecache_consist_1kWR_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_1kWR_t_CPPFLAGS = 	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=1024 -DTEST_WRITERS
-ma_pagecache_consist_64kWR_t_SOURCES =	$(ma_pagecache_consist_src)
-ma_pagecache_consist_64kWR_t_CPPFLAGS =	$(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=65536 -DTEST_WRITERS
-
-ma_pagecache_rwconsist_1k_t_SOURCES =	ma_pagecache_rwconsist.c
-ma_pagecache_rwconsist_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024
-ma_pagecache_rwconsist2_1k_t_SOURCES =	ma_pagecache_rwconsist2.c
-ma_pagecache_rwconsist2_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024
-
-# the generic lock manager may not be used in the end and lockman1-t crashes,
-# and lockman2-t takes at least quarter an hour,
-# so we don't build lockman-t and lockman1-t and lockman2-t 
-CLEANFILES =		aria_log_control page_cache_test_file_1 \
-			aria_log.????????
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/oqgraph/Makefile.am b/storage/oqgraph/Makefile.am
deleted file mode 100644
index e99e134db02..00000000000
--- a/storage/oqgraph/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright (C) 2007-2009 Arjen G Lentz & Antony T Curtis for Open Query
-#
-# 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; 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 */
-
-# ======================================================================
-# Open Query Graph Computation Engine, based on a concept by Arjen Lentz
-# Mk.II implementation by Antony Curtis & Arjen Lentz
-# For more information, documentation, support, enhancement engineering,
-# and non-GPL licensing, see http://openquery.com/graph
-# or contact graph@openquery.com
-# For packaged binaries, see http://ourdelta.org
-# ======================================================================
-
-mysqlplugindir=		$(pkglibdir)/plugin
-
-BOOST_CXXFLAGS =	-frtti -fexceptions -fimplicit-templates
-#BOOST_CXXFLAGS+=	-g
-#original flags before 2009-11-10
-#BOOST_CXXFLAGS+=	-O3 -fomit-frame-pointer -fstrict-aliasing
-#BOOST_CXXFLAGS+=	-momit-leaf-frame-pointer -falign-loops
-#modified flags:
-# - remove omit-frame-pointer, x86 specific (fails on PPC) + hinders debugging
-#   Option details from gcc man:
-#   Don't keep the frame pointer in a register for functions that don't need one.
-#   This avoids the instructions to save, set up and restore frame pointers;
-#   it also makes an extra register available in many functions.
-#   It also makes debugging impossible on some machines.
-#   (automatically gets enabled anyway by -O* on some architectures)
-BOOST_CXXFLAGS+=	-O3 -fstrict-aliasing
-BOOST_CXXFLAGS+=	-falign-loops
-if HAVE_FVISIBILITY_INLINES_HIDDEN
-BOOST_CXXFLAGS+=	-fvisibility-inlines-hidden
-endif
-BOOST_CXXFLAGS+=	-funroll-loops -fno-trapping-math
-
-EXTRA_DIST =	ha_oqgraph.h ha_oqgraph.cc graphcore.cc \
-		graphcore-graph.h graphcore-types.h graphcore.h \
-		CMakeLists.txt plug.in oqgraph_probes.d
-
-# DTRACE =                @DTRACE@
-# DTRACEFLAGS =           @DTRACEFLAGS@
-# DTRACEFILES =           .libs/libha_oqgraph_la-ha_oqgraph.o
-
-ORIG_CXXFLAGS = @CXXFLAGS@
-CXXFLAGS=
-noinst_HEADERS = ha_oqgraph.h \
-		 graphcore-graph.h graphcore-types.h graphcore.h
-#		 oqgraph_probes.h
-
-noinst_LTLIBRARIES = libgraphcore.la
-libgraphcore_la_SOURCES = graphcore.cc
-libgraphcore_la_CXXFLAGS = $(ORIG_CXXFLAGS) $(BOOST_CXXFLAGS)
-
-if BUILD_OQGRAPH_FOR_MYSQL
-
-if BUILD_OQGRAPH_STANDALONE
-INCLUDES = -DDBUG_ON -DSAFE_MUTEX -DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX -DHAVE_OQGRAPH $(MYSQL_INC) 
-else
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/regex -I$(top_srcdir)/sql -I$(srcdir) -DHAVE_OQGRAPH 
-endif !BUILD_OQGRAPH_STANDALONE
-
-EXTRA_LTLIBRARIES = ha_oqgraph.la
-mysqlplugin_LTLIBRARIES = @plugin_oqgraph_shared_target@
-ha_oqgraph_la_SOURCES = ha_oqgraph.cc
-ha_oqgraph_la_LIBADD = libgraphcore.la
-
-# if HAVE_DTRACE
-#   ha_oqgraph_la_LIBADD += oqgraph_probes.o
-# endif
-
-ha_oqgraph_la_LDFLAGS =	-shared -module -rpath $(mysqlplugindir)
-ha_oqgraph_la_CFLAGS = $(ORIG_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_oqgraph_la_CXXFLAGS = $(ORIG_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-
-# oqgraph_probes.h: oqgraph_probes.d
-# 	$(DTRACE) $(DTRACEFLAGS) -h -s oqgraph_probes.d
-# 	mv oqgraph_probes.h oqgraph_probes.h.bak
-# 	sed "s/#include <unistd.h>//g" oqgraph_probes.h.bak > oqgraph_probes.h
-# 	rm oqgraph_probes.h.bak
-
-# oqgraph_probes.o:
-# 	$(DTRACE) $(DTRACEFLAGS) -G -s oqgraph_probes.d $(DTRACEFILES)
-
-endif BUILD_OQGRAPH_FOR_MYSQL
-
-# End
diff --git a/storage/oqgraph/plug.in b/storage/oqgraph/plug.in
deleted file mode 100644
index 38c8310a915..00000000000
--- a/storage/oqgraph/plug.in
+++ /dev/null
@@ -1,40 +0,0 @@
-MYSQL_STORAGE_ENGINE(oqgraph,,[Graph Storage Engine],
-        [Open Query Graph Computation Engine], [])
-MYSQL_PLUGIN_DYNAMIC(oqgraph,   [ha_oqgraph.la])
-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(oqgraph, [ha_oqgraph.cc])
-MYSQL_PLUGIN_ACTIONS(oqgraph,[
-  AC_LANG_PUSH([C++])
-  AC_MSG_CHECKING([whether compiler supports  -fvisibility-inlines-hidden])
-  OLD_CXXFLAGS=$CXXFLAGS
-  CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-  AC_TRY_COMPILE([],[],[
-    AM_CONDITIONAL(HAVE_FVISIBILITY_INLINES_HIDDEN, true)
-    AC_MSG_RESULT([yes])
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-  CXXFLAGS=$OLD_CXXFLAGS
-  AC_LANG_POP()
-])
-
-AM_CONDITIONAL([BUILD_OQGRAPH_FOR_MYSQL], true)
-AM_CONDITIONAL([BUILD_OQGRAPH_STANDALONE], false)
-AM_CONDITIONAL([HAVE_DTRACE], false)
-AM_CONDITIONAL(HAVE_FVISIBILITY_INLINES_HIDDEN, false)
-
-AC_LANG_PUSH([C++])
-
-AC_MSG_CHECKING([for Boost usable by OQGraph engine])
-AC_PREPROC_IFELSE(
-   [
-#include <boost/version.hpp>
-#if BOOST_VERSION >= 104000
-#else
-#error oops
-#endif
-   ],
-   [AC_MSG_RESULT([yes])],
-   [AC_MSG_RESULT([no])
-   MYSQL_PLUGIN_WITHOUT(oqgraph)])
-
-AC_LANG_POP()
diff --git a/storage/pbxt/Makefile.am b/storage/pbxt/Makefile.am
deleted file mode 100644
index 371756c84be..00000000000
--- a/storage/pbxt/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = src bin
-
-EXTRA_DIST = CMakeLists.txt plug.in
diff --git a/storage/pbxt/bin/Makefile.am b/storage/pbxt/bin/Makefile.am
deleted file mode 100644
index ab7b711a6f1..00000000000
--- a/storage/pbxt/bin/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Used to build Makefile.in
-
-INCLUDES =	-I$(top_srcdir)/include -I$(top_builddir)/include \
-			-I$(top_srcdir)/regex \
-			-I$(top_srcdir)/storage/innobase/include \
-			-I$(top_srcdir)/sql \
-			-I$(srcdir) \
-			-I$(srcdir)/../src
-
-bin_PROGRAMS =		xtstat
-
-xtstat_SOURCES =	xtstat_xt.cc ../src/strutil_xt.cc
-
-xtstat_LDADD =		$(top_builddir)/libmysql/libmysqlclient.la
diff --git a/storage/pbxt/plug.in b/storage/pbxt/plug.in
deleted file mode 100644
index 02c5d8adcbe..00000000000
--- a/storage/pbxt/plug.in
+++ /dev/null
@@ -1,8 +0,0 @@
-MYSQL_STORAGE_ENGINE(pbxt,no,  [PBXT Storage Engine],
-        [MVCC-based transactional engine], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(pbxt, [storage/pbxt])
-MYSQL_PLUGIN_STATIC(pbxt,    [src/libpbxt.a])
-MYSQL_PLUGIN_ACTIONS(pbxt,  [
-#               AC_CONFIG_FILES(storage/pbxt/src/Makefile)
-               ])
-MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(pbxt, [[src/ha_pbxt.cc],[src/myxt_xt.cc],[src/discover_xt.cc]])
diff --git a/storage/pbxt/src/Makefile.am b/storage/pbxt/src/Makefile.am
deleted file mode 100644
index fc4c4ef8f1e..00000000000
--- a/storage/pbxt/src/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-# Used to build Makefile.in
-
-MYSQLDATAdir =          $(localstatedir)
-MYSQLSHAREdir =         $(pkgdatadir)
-MYSQLBASEdir=           $(prefix)
-MYSQLLIBdir=            $(pkglibdir)
-pkgplugindir =          $(pkglibdir)/plugin
-INCLUDES=		-I$(top_srcdir)/include -I$(top_builddir)/include \
-			-I$(top_srcdir)/regex \
-			-I$(top_srcdir)/storage/innobase/include \
-			-I$(top_srcdir)/sql \
-			-I$(srcdir)
-
-LIBS =
-
-LDADD =
-
-noinst_HEADERS =		bsearch_xt.h cache_xt.h ccutils_xt.h database_xt.h \
-						datadic_xt.h datalog_xt.h filesys_xt.h hashtab_xt.h \
-						ha_pbxt.h heap_xt.h index_xt.h linklist_xt.h \
-						memory_xt.h myxt_xt.h pthread_xt.h restart_xt.h \
-						pbms_enabled.h sortedlist_xt.h strutil_xt.h \
-						tabcache_xt.h table_xt.h trace_xt.h thread_xt.h \
-						util_xt.h xaction_xt.h xactlog_xt.h lock_xt.h \
-						systab_xt.h ha_xtsys.h discover_xt.h backup_xt.h \
-						pbms.h xt_config.h xt_defs.h xt_errno.h locklist_xt.h
-EXTRA_LTLIBRARIES =	libpbxt.la
-
-libpbxt_la_SOURCES =	bsearch_xt.cc cache_xt.cc ccutils_xt.cc database_xt.cc \
-						datadic_xt.cc datalog_xt.cc filesys_xt.cc hashtab_xt.cc \
-						ha_pbxt.cc heap_xt.cc index_xt.cc linklist_xt.cc \
-						memory_xt.cc myxt_xt.cc pthread_xt.cc restart_xt.cc \
-						sortedlist_xt.cc strutil_xt.cc \
-						tabcache_xt.cc table_xt.cc trace_xt.cc thread_xt.cc \
-						systab_xt.cc ha_xtsys.cc discover_xt.cc backup_xt.cc \
-						util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc locklist_xt.cc
-
-libpbxt_la_LDFLAGS =	-module
-
-# These are the warning Drizzle uses:
-# DRIZZLE_WARNINGS =		-W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter
-
-libpbxt_la_CXXFLAGS =	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libpbxt_la_CFLAGS =		$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99
-
-EXTRA_LIBRARIES =		libpbxt.a
-noinst_LIBRARIES = 		libpbxt.a
-libpbxt_a_SOURCES =		$(libpbxt_la_SOURCES)
-
-EXTRA_DIST =			pbms_enabled.cc win_inttypes.h
diff --git a/storage/sphinx/Makefile.am b/storage/sphinx/Makefile.am
deleted file mode 100644
index 5f58d673547..00000000000
--- a/storage/sphinx/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
-
-#called from the top level Makefile
-
-MYSQLDATAdir =          $(localstatedir)
-MYSQLSHAREdir =         $(pkgdatadir)
-MYSQLBASEdir=           $(prefix)
-MYSQLLIBdir=            $(pkglibdir)
-pkgplugindir =          $(pkglibdir)/plugin
-INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
-			-I$(top_srcdir)/regex \
-			-I$(top_srcdir)/sql \
-                        -I$(srcdir)
-
-DEFS= @DEFS@ -D_REENTRANT -D_PTHREADS -DMYSQL_SERVER
-
-noinst_HEADERS =	ha_sphinx.h
-
-EXTRA_LTLIBRARIES =	ha_sphinx.la
-pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
-
-ha_sphinx_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir) \
-			-L$(top_builddir)/libservices -lmysqlservices
-ha_sphinx_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_sphinx_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_sphinx_la_SOURCES =	ha_sphinx.cc
-
-sphinx_la_LDFLAGS = -module
-sphinx_la_CXXFLAGS = $(AM_CFLAGS)
-sphinx_la_CFLAGS = $(AM_CFLAGS)
-sphinx_la_SOURCES = snippets_udf.cc
-
-EXTRA_LIBRARIES =	libsphinx.a
-noinst_LIBRARIES =	@plugin_sphinx_static_target@
-libsphinx_a_CXXFLAGS =	$(AM_CFLAGS)
-libsphinx_a_CFLAGS =	$(AM_CFLAGS)
-libsphinx_a_SOURCES=	ha_sphinx.cc
-
-EXTRA_DIST =		CMakeLists.txt
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/sphinx/plug.in b/storage/sphinx/plug.in
deleted file mode 100644
index 6c96e41ae52..00000000000
--- a/storage/sphinx/plug.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MYSQL_STORAGE_ENGINE(sphinx,,[Sphinx Storage Engine],
-        [SE client for Sphinx search daemon], [])
-MYSQL_PLUGIN_DIRECTORY(sphinx, [storage/sphinx])
-MYSQL_PLUGIN_STATIC(sphinx,  [libsphinx.a])
-MYSQL_PLUGIN_DYNAMIC(sphinx, [ha_sphinx.la])
-
diff --git a/storage/xtradb/Makefile.am b/storage/xtradb/Makefile.am
deleted file mode 100644
index 0a6d7ddefb6..00000000000
--- a/storage/xtradb/Makefile.am
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright (C) 2001, 2004, 2006 MySQL AB & Innobase Oy
-#
-# 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; version 2 of the License.
-# 
-# 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
-
-# Process this file with automake to create Makefile.in
-
-MYSQLDATAdir=		$(localstatedir)
-MYSQLSHAREdir=		$(pkgdatadir)
-MYSQLBASEdir=		$(prefix)
-MYSQLLIBdir=		$(pkglibdir)
-pkgplugindir=		$(pkglibdir)/plugin
-INCLUDES=		-I$(top_srcdir)/include -I$(top_builddir)/include \
-			-I$(top_srcdir)/regex \
-			-I$(srcdir)/include \
-			-I$(top_srcdir)/sql \
-			-I$(srcdir) @ZLIB_INCLUDES@
-
-DEFS=			@DEFS@
-
-
-noinst_HEADERS=		\
-			handler/ha_innodb.h	\
-			handler/i_s.h		\
-			include/btr0btr.h	\
-			include/btr0btr.ic	\
-			include/btr0cur.h	\
-			include/btr0cur.ic	\
-			include/btr0pcur.h	\
-			include/btr0pcur.ic	\
-			include/btr0sea.h	\
-			include/btr0sea.ic	\
-			include/btr0types.h	\
-			include/buf0buddy.h	\
-			include/buf0buddy.ic	\
-			include/buf0buf.h	\
-			include/buf0buf.ic	\
-			include/buf0flu.h	\
-			include/buf0flu.ic	\
-			include/buf0lru.h	\
-			include/buf0lru.ic	\
-			include/buf0rea.h	\
-			include/buf0types.h	\
-			include/data0data.h	\
-			include/data0data.ic	\
-			include/data0type.h	\
-			include/data0type.ic	\
-			include/data0types.h	\
-			include/db0err.h	\
-			include/dict0boot.h	\
-			include/dict0boot.ic	\
-			include/dict0crea.h	\
-			include/dict0crea.ic	\
-			include/dict0dict.h	\
-			include/dict0dict.ic	\
-			include/dict0load.h	\
-			include/dict0load.ic	\
-			include/dict0mem.h	\
-			include/dict0mem.ic	\
-			include/dict0types.h	\
-			include/dyn0dyn.h	\
-			include/dyn0dyn.ic	\
-			include/eval0eval.h	\
-			include/eval0eval.ic	\
-			include/eval0proc.h	\
-			include/eval0proc.ic	\
-			include/fil0fil.h	\
-			include/fsp0fsp.h	\
-			include/fsp0fsp.ic	\
-			include/fsp0types.h	\
-			include/fut0fut.h	\
-			include/fut0fut.ic	\
-			include/fut0lst.h	\
-			include/fut0lst.ic	\
-			include/ha0ha.h		\
-			include/ha0ha.ic	\
-			include/ha0storage.h	\
-			include/ha0storage.ic	\
-			include/ha_prototypes.h	\
-			include/handler0alter.h	\
-			include/hash0hash.h	\
-			include/hash0hash.ic	\
-			include/ibuf0ibuf.h	\
-			include/ibuf0ibuf.ic	\
-			include/ibuf0types.h	\
-			include/lock0iter.h	\
-			include/lock0lock.h	\
-			include/lock0lock.ic	\
-			include/lock0priv.h	\
-			include/lock0priv.ic	\
-			include/lock0types.h	\
-			include/log0log.h	\
-			include/log0log.ic	\
-			include/log0recv.h	\
-			include/log0recv.ic	\
-			include/mach0data.h	\
-			include/mach0data.ic	\
-			include/mem0dbg.h	\
-			include/mem0dbg.ic	\
-			include/mem0mem.h	\
-			include/mem0mem.ic	\
-			include/mem0pool.h	\
-			include/mem0pool.ic	\
-			include/mtr0log.h	\
-			include/mtr0log.ic	\
-			include/mtr0mtr.h	\
-			include/mtr0mtr.ic	\
-			include/mtr0types.h	\
-			include/mysql_addons.h	\
-			include/os0file.h	\
-			include/os0proc.h	\
-			include/os0proc.ic	\
-			include/os0sync.h	\
-			include/os0sync.ic	\
-			include/os0thread.h	\
-			include/os0thread.ic	\
-			include/page0cur.h	\
-			include/page0cur.ic	\
-			include/page0page.h	\
-			include/page0page.ic	\
-			include/page0types.h	\
-			include/page0zip.h	\
-			include/page0zip.ic	\
-			include/pars0grm.h	\
-			include/pars0opt.h	\
-			include/pars0opt.ic	\
-			include/pars0pars.h	\
-			include/pars0pars.ic	\
-			include/pars0sym.h	\
-			include/pars0sym.ic	\
-			include/pars0types.h	\
-			include/que0que.h	\
-			include/que0que.ic	\
-			include/que0types.h	\
-			include/read0read.h	\
-			include/read0read.ic	\
-			include/read0types.h	\
-			include/rem0cmp.h	\
-			include/rem0cmp.ic	\
-			include/rem0rec.h	\
-			include/rem0rec.ic	\
-			include/rem0types.h	\
-			include/row0ext.h	\
-			include/row0ext.ic	\
-			include/row0ins.h	\
-			include/row0ins.ic	\
-			include/row0merge.h	\
-			include/row0mysql.h	\
-			include/row0mysql.ic	\
-			include/row0purge.h	\
-			include/row0purge.ic	\
-			include/row0row.h	\
-			include/row0row.ic	\
-			include/row0sel.h	\
-			include/row0sel.ic	\
-			include/row0types.h	\
-			include/row0uins.h	\
-			include/row0uins.ic	\
-			include/row0umod.h	\
-			include/row0umod.ic	\
-			include/row0undo.h	\
-			include/row0undo.ic	\
-			include/row0upd.h	\
-			include/row0upd.ic	\
-			include/row0vers.h	\
-			include/row0vers.ic	\
-			include/srv0que.h	\
-			include/srv0srv.h	\
-			include/srv0srv.ic	\
-			include/srv0start.h	\
-			include/sync0arr.h	\
-			include/sync0arr.ic	\
-			include/sync0rw.h	\
-			include/sync0rw.ic	\
-			include/sync0sync.h	\
-			include/sync0sync.ic	\
-			include/sync0types.h	\
-			include/thr0loc.h	\
-			include/thr0loc.ic	\
-			include/trx0i_s.h	\
-			include/trx0purge.h	\
-			include/trx0purge.ic	\
-			include/trx0rec.h	\
-			include/trx0rec.ic	\
-			include/trx0roll.h	\
-			include/trx0roll.ic	\
-			include/trx0rseg.h	\
-			include/trx0rseg.ic	\
-			include/trx0sys.h	\
-			include/trx0sys.ic	\
-			include/trx0trx.h	\
-			include/trx0trx.ic	\
-			include/trx0types.h	\
-			include/trx0undo.h	\
-			include/trx0undo.ic	\
-			include/trx0xa.h	\
-			include/univ.i		\
-			include/usr0sess.h	\
-			include/usr0sess.ic	\
-			include/usr0types.h	\
-			include/ut0auxconf.h	\
-			include/ut0byte.h	\
-			include/ut0byte.ic	\
-			include/ut0dbg.h	\
-			include/ut0list.h	\
-			include/ut0list.ic	\
-			include/ut0lst.h	\
-			include/ut0mem.h	\
-			include/ut0mem.ic	\
-			include/ut0rbt.h	\
-			include/ut0rnd.h	\
-			include/ut0rnd.ic	\
-			include/ut0sort.h	\
-			include/ut0ut.h		\
-			include/ut0ut.ic	\
-			include/ut0vec.h	\
-			include/ut0vec.ic	\
-			include/ut0wqueue.h	\
-			handler/innodb_patch_info.h	\
-			mem/mem0dbg.c
-
-EXTRA_LIBRARIES=	libxtradb.a
-noinst_LIBRARIES=	@plugin_xtradb_static_target@
-libxtradb_a_SOURCES=	\
-			btr/btr0btr.c			\
-			btr/btr0cur.c			\
-			btr/btr0pcur.c			\
-			btr/btr0sea.c			\
-			buf/buf0buddy.c			\
-			buf/buf0buf.c			\
-			buf/buf0flu.c			\
-			buf/buf0lru.c			\
-			buf/buf0rea.c			\
-			data/data0data.c		\
-			data/data0type.c		\
-			dict/dict0boot.c		\
-			dict/dict0crea.c		\
-			dict/dict0dict.c		\
-			dict/dict0load.c		\
-			dict/dict0mem.c			\
-			dyn/dyn0dyn.c			\
-			eval/eval0eval.c		\
-			eval/eval0proc.c		\
-			fil/fil0fil.c			\
-			fsp/fsp0fsp.c			\
-			fut/fut0fut.c			\
-			fut/fut0lst.c			\
-			ha/ha0ha.c			\
-			ha/ha0storage.c			\
-			ha/hash0hash.c			\
-			handler/ha_innodb.cc		\
-			handler/handler0alter.cc	\
-			handler/i_s.cc			\
-			handler/mysql_addons.cc		\
-			ibuf/ibuf0ibuf.c		\
-			lock/lock0iter.c		\
-			lock/lock0lock.c		\
-			log/log0log.c			\
-			log/log0recv.c			\
-			mach/mach0data.c		\
-			mem/mem0mem.c			\
-			mem/mem0pool.c			\
-			mtr/mtr0log.c			\
-			mtr/mtr0mtr.c			\
-			os/os0file.c			\
-			os/os0proc.c			\
-			os/os0sync.c			\
-			os/os0thread.c			\
-			page/page0cur.c			\
-			page/page0page.c		\
-			page/page0zip.c			\
-			pars/lexyy.c			\
-			pars/pars0grm.c			\
-			pars/pars0opt.c			\
-			pars/pars0pars.c		\
-			pars/pars0sym.c			\
-			que/que0que.c			\
-			read/read0read.c		\
-			rem/rem0cmp.c			\
-			rem/rem0rec.c			\
-			row/row0ext.c			\
-			row/row0ins.c			\
-			row/row0merge.c			\
-			row/row0mysql.c			\
-			row/row0purge.c			\
-			row/row0row.c			\
-			row/row0sel.c			\
-			row/row0uins.c			\
-			row/row0umod.c			\
-			row/row0undo.c			\
-			row/row0upd.c			\
-			row/row0vers.c			\
-			srv/srv0que.c			\
-			srv/srv0srv.c			\
-			srv/srv0start.c			\
-			sync/sync0arr.c			\
-			sync/sync0rw.c			\
-			sync/sync0sync.c		\
-			thr/thr0loc.c			\
-			trx/trx0i_s.c			\
-			trx/trx0purge.c			\
-			trx/trx0rec.c			\
-			trx/trx0roll.c			\
-			trx/trx0rseg.c			\
-			trx/trx0sys.c			\
-			trx/trx0trx.c			\
-			trx/trx0undo.c			\
-			usr/usr0sess.c			\
-			ut/ut0byte.c			\
-			ut/ut0dbg.c			\
-			ut/ut0list.c			\
-			ut/ut0mem.c			\
-			ut/ut0rbt.c			\
-			ut/ut0rnd.c			\
-			ut/ut0ut.c			\
-			ut/ut0vec.c			\
-			ut/ut0wqueue.c
-
-libxtradb_a_CXXFLAGS=	$(AM_CXXFLAGS)
-libxtradb_a_CFLAGS=	$(AM_CFLAGS)
-
-EXTRA_LTLIBRARIES=	ha_xtradb.la
-pkgplugin_LTLIBRARIES=	@plugin_xtradb_shared_target@
-
-ha_xtradb_la_LDFLAGS=	-module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
-ha_xtradb_la_CXXFLAGS=	-shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_xtradb_la_CFLAGS=	-shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_xtradb_la_SOURCES=	$(libxtradb_a_SOURCES)
-
-EXTRA_DIST=		CMakeLists.txt plug.in \
-			pars/make_bison.sh pars/make_flex.sh \
-			pars/pars0grm.y pars/pars0lex.l
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/storage/xtradb/plug.in b/storage/xtradb/plug.in
deleted file mode 100644
index 24ab62ec24b..00000000000
--- a/storage/xtradb/plug.in
+++ /dev/null
@@ -1,231 +0,0 @@
-#
-# Copyright (c) 2006, 2010, Innobase Oy. All Rights Reserved.
-# 
-# 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; version 2 of the License.
-# 
-# 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
-#
-
-MYSQL_STORAGE_ENGINE(xtradb,  xtradb, [XtraDB Storage Engine],
-        [XtraDB - a drop-in replacement for InnoDB],
-        dnl[max,max-no-ndb]
-        )
-MYSQL_PLUGIN_DISABLED(xtradb)
-MYSQL_PLUGIN_DIRECTORY(xtradb, [storage/xtradb])
-MYSQL_PLUGIN_STATIC(xtradb,   [libxtradb.a])
-MYSQL_PLUGIN_DYNAMIC(xtradb,  [ha_xtradb.la])
-MYSQL_PLUGIN_ACTIONS(xtradb,  [
-  with_plugin_innobase=$with_plugin_xtradb # for legacy code in configure.in
-  AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
-  AC_SUBST(innodb_system_libs)
-  AC_CHECK_HEADERS(aio.h sched.h)
-  AC_CHECK_SIZEOF(int, 4)
-  AC_CHECK_SIZEOF(long, 4)
-  AC_CHECK_SIZEOF(void*, 4)
-  AC_CHECK_FUNCS(sched_yield fdatasync localtime_r)
-  AC_C_BIGENDIAN
-  case "$target_os" in
-	lin*)
-		CFLAGS="$CFLAGS -DUNIV_LINUX";;
-	hpux10*)
-		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;
-	hp*)
-		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;
-	aix*)
-		CFLAGS="$CFLAGS -DUNIV_AIX";;
-	irix*|osf*|sysv5uw7*|openbsd*)
-		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
-	*solaris*|*SunOS*)
-		CFLAGS="$CFLAGS -DUNIV_SOLARIS";;
-  esac
-
-  INNODB_DYNAMIC_CFLAGS="-DMYSQL_DYNAMIC_PLUGIN"
-
-  case "$target_cpu" in
-	x86_64)
-		# The AMD64 ABI forbids absolute addresses in shared libraries
-		;;
-	*86)
-		# Use absolute addresses on IA-32
-		INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
-		;;
-  esac
-  AC_SUBST(INNODB_DYNAMIC_CFLAGS)
-
-  AC_MSG_CHECKING(whether GCC atomic builtins are available)
-  # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
-  AC_TRY_RUN(
-    [
-      int main()
-      {
-	long	x;
-	long	y;
-	long	res;
-	char	c;
-
-	x = 10;
-	y = 123;
-	res = __sync_bool_compare_and_swap(&x, x, y);
-	if (!res || x != y) {
-          return(1);
-        }
-
-	x = 10;
-	y = 123;
-	res = __sync_bool_compare_and_swap(&x, x + 1, y);
-	if (res || x != 10) {
-          return(1);
-        }
-
-	x = 10;
-	y = 123;
-	res = __sync_add_and_fetch(&x, y);
-	if (res != 123 + 10 || x != 123 + 10) {
-	  return(1);
-	}
-
-	c = 10;
-	res = __sync_lock_test_and_set(&c, 123);
-	if (res != 10 || c != 123) {
-	  return(1);
-	}
-
-	return(0);
-      }
-    ],
-    [
-      AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
-                [GCC atomic builtins are available])
-      AC_MSG_RESULT(yes)
-    ],
-    [
-      AC_MSG_RESULT(no)
-    ]
-  )
-
-  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
-  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
-  AC_TRY_RUN(
-    [
-      #include <pthread.h>
-      #include <string.h>
-
-      int main(int argc, char** argv) {
-        pthread_t       x1;
-        pthread_t       x2;
-        pthread_t       x3;
-
-	memset(&x1, 0x0, sizeof(x1));
-	memset(&x2, 0x0, sizeof(x2));
-	memset(&x3, 0x0, sizeof(x3));
-
-        __sync_bool_compare_and_swap(&x1, x2, x3);
-
-        return(0);
-      }
-    ],
-    [
-      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
-                [pthread_t can be used by GCC atomic builtins])
-      AC_MSG_RESULT(yes)
-    ],
-    [
-      AC_MSG_RESULT(no)
-    ]
-  )
-
-  AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-  # either define HAVE_IB_SOLARIS_ATOMICS or not
-  AC_CHECK_FUNCS(atomic_add_long \
-		 atomic_cas_32 \
-		 atomic_cas_64 \
-		 atomic_cas_ulong,
-
-		 AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
-			   [Define to 1 if Solaris libc atomic functions \
-			    are available])
-  )
-
-  AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
-  # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
-  AC_TRY_RUN(
-    [
-      #include <pthread.h>
-      #include <string.h>
-
-      int main(int argc, char** argv) {
-        pthread_t       x1;
-        pthread_t       x2;
-        pthread_t       x3;
-
-        memset(&x1, 0x0, sizeof(x1));
-        memset(&x2, 0x0, sizeof(x2));
-        memset(&x3, 0x0, sizeof(x3));
-
-        if (sizeof(pthread_t) == 4) {
-        
-          atomic_cas_32(&x1, x2, x3);
-        
-        } else if (sizeof(pthread_t) == 8) {
-        
-          atomic_cas_64(&x1, x2, x3);
-        
-        } else {
-        
-          return(1);
-        }
-
-	return(0);
-      }
-    ],
-    [
-      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
-                [pthread_t can be used by solaris atomics])
-      AC_MSG_RESULT(yes)
-    ],
-    [
-      AC_MSG_RESULT(no)
-    ]
-  )
-
-  # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
-  # to use in the source
-  AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
-
-  # Check for x86 PAUSE instruction
-  AC_MSG_CHECKING(for x86 PAUSE instruction)
-  # We have to actually try running the test program, because of a bug
-  # in Solaris on x86_64, where it wrongly reports that PAUSE is not
-  # supported when trying to run an application. See
-  # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684
-  # We use ib_ prefix to avoid collisoins if this code is added to
-  # mysql's configure.in.
-  AC_TRY_RUN(
-    [
-      int main() {
-        __asm__ __volatile__ ("pause");
-        return(0);
-      }
-    ],
-    [
-      AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
-      AC_MSG_RESULT(yes)
-    ],
-    [
-      AC_MSG_RESULT(no)
-    ],
-    [
-      AC_MSG_RESULT(no)
-    ]
-  )
-  ])
-
-# vim: set ft=config: