2006-04-11 15:45:10 +02:00
|
|
|
# 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
|
2007-03-02 11:20:23 +01:00
|
|
|
# the Free Software Foundation; version 2 of the License.
|
2006-04-11 15:45:10 +02:00
|
|
|
#
|
|
|
|
# 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
|
|
|
|
|
2006-09-07 17:07:17 +02:00
|
|
|
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@
|
|
|
|
|
2006-09-12 15:52:01 +02:00
|
|
|
# "." is needed first because tests in unittest need libmaria
|
|
|
|
SUBDIRS = . unittest
|
|
|
|
|
2006-10-11 18:30:16 +02:00
|
|
|
EXTRA_DIST = ma_test_all.sh ma_test_all.res ma_ft_stem.c CMakeLists.txt plug.in
|
2006-04-11 15:45:10 +02:00
|
|
|
pkgdata_DATA = ma_test_all ma_test_all.res
|
|
|
|
pkglib_LIBRARIES = libmaria.a
|
2006-05-05 20:32:02 +02:00
|
|
|
bin_PROGRAMS = maria_chk maria_pack maria_ftdump
|
2006-04-11 15:45:10 +02:00
|
|
|
maria_chk_DEPENDENCIES= $(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
# 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 Maria).
|
|
|
|
# For now, it imposes that storage/myisam be built before storage/maria.
|
|
|
|
maria_chk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
2006-04-11 15:45:10 +02:00
|
|
|
maria_pack_DEPENDENCIES=$(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
maria_pack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
WL#3234 Maria control file manager.
Fitting ma_control_file_test into the mytap unittest framework:
new directories:
- unittest/storage/ for unit tests of any storage engine
- unittest/storage/maria for ... Maria, containing ma_control_file-t.
Later, older tests like ma_test*, ma_test_all (but which is Unix
dependent in its current form) could move here too.
The plugins macro enable building of unittest/storage/X for any
enabled engine X which has such a directory.
If Falcon wants to have unit tests there too, I may have to merge
this patch into 5.x one day.
config/ac-macros/plugins.m4:
If a storage engine has a directory in unittest/storage, build this
directory.
configure.in:
build storage engines' unit tests.
storage/maria/Makefile.am:
ma_control_file_test moves to unittest/storage/maria
storage/maria/ma_control_file.c:
more error codes when opening the control file fails.
ma_control_file_end() may now return an error if my_close() failed.
storage/maria/ma_control_file.h:
more error codes when opening the control file fails.
unittest/Makefile.am:
adding unit tests for storage engines.
Note that unit.pl simply recurses into "storage", so if a unit test for
storage engine X has been built previously, and now you re-configure
(without making clean) to disable this engine, then the unit test of
X will not be rebuilt but will still be present in storage/X, so will
be run.
unittest/storage/maria/ma_control_file-t.c:
Making the test fit the mytap framework (return all the way up
the stack instead of assert(); use the mytap functions plan(), ok() etc).
Adding test of file too short/long.
unittest/storage/maria/Makefile.am:
a_control_file-t is added to the Maria unit tests.
Later, older tests (ma_test1 etc) could also move here.
unittest/storage/Makefile.am:
New BitKeeper file ``unittest/storage/Makefile.am''
2006-09-11 16:12:31 +02:00
|
|
|
noinst_PROGRAMS = ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test
|
2006-09-04 16:53:09 +02:00
|
|
|
noinst_HEADERS = maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
|
2006-08-17 15:20:58 +02:00
|
|
|
ma_sp_defs.h ma_fulltext.h ma_ftdefs.h ma_ft_test1.h \
|
2006-11-09 16:20:40 +01:00
|
|
|
ma_ft_eval.h trnman.h lockman.h tablockman.h \
|
2007-03-01 22:36:46 +01:00
|
|
|
ma_control_file.h ha_maria.h ma_blockrec.h \
|
2007-06-11 16:29:53 +02:00
|
|
|
ma_loghandler.h ma_loghandler_lsn.h ma_pagecache.h
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_test1_DEPENDENCIES= $(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
ma_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_test2_DEPENDENCIES= $(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
ma_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_test3_DEPENDENCIES= $(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
ma_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
2006-04-11 15:45:10 +02:00
|
|
|
#ma_ft_test1_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
#ma_ft_eval_DEPENDENCIES= $(LIBRARIES)
|
|
|
|
maria_ftdump_DEPENDENCIES= $(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
maria_ftdump_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_rt_test_DEPENDENCIES= $(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
ma_rt_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_sp_test_DEPENDENCIES= $(LIBRARIES)
|
2006-09-07 17:07:17 +02:00
|
|
|
ma_sp_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
2006-04-11 15:45:10 +02:00
|
|
|
libmaria_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.c ma_locking.c \
|
|
|
|
ma_rrnd.c ma_scan.c ma_cache.c \
|
|
|
|
ma_statrec.c ma_packrec.c ma_dynrec.c \
|
2007-01-18 20:38:14 +01:00
|
|
|
ma_blockrec.c ma_bitmap.c \
|
2006-04-11 15:45:10 +02:00
|
|
|
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\
|
2006-05-05 20:32:02 +02:00
|
|
|
ma_range.c ma_dbug.c ma_checksum.c \
|
2006-04-11 15:45:10 +02:00
|
|
|
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 \
|
2006-09-07 17:07:17 +02:00
|
|
|
ma_ft_nlq_search.c ft_maria.c ma_sort.c \
|
2006-11-09 16:20:40 +01:00
|
|
|
ha_maria.cc trnman.c lockman.c tablockman.c \
|
2006-04-11 15:45:10 +02:00
|
|
|
ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c \
|
2007-04-04 22:37:09 +02:00
|
|
|
ma_sp_key.c ma_control_file.c ma_loghandler.c \
|
|
|
|
ma_pagecache.c ma_pagecaches.c
|
WL#3234 Maria control file manager.
Fitting ma_control_file_test into the mytap unittest framework:
new directories:
- unittest/storage/ for unit tests of any storage engine
- unittest/storage/maria for ... Maria, containing ma_control_file-t.
Later, older tests like ma_test*, ma_test_all (but which is Unix
dependent in its current form) could move here too.
The plugins macro enable building of unittest/storage/X for any
enabled engine X which has such a directory.
If Falcon wants to have unit tests there too, I may have to merge
this patch into 5.x one day.
config/ac-macros/plugins.m4:
If a storage engine has a directory in unittest/storage, build this
directory.
configure.in:
build storage engines' unit tests.
storage/maria/Makefile.am:
ma_control_file_test moves to unittest/storage/maria
storage/maria/ma_control_file.c:
more error codes when opening the control file fails.
ma_control_file_end() may now return an error if my_close() failed.
storage/maria/ma_control_file.h:
more error codes when opening the control file fails.
unittest/Makefile.am:
adding unit tests for storage engines.
Note that unit.pl simply recurses into "storage", so if a unit test for
storage engine X has been built previously, and now you re-configure
(without making clean) to disable this engine, then the unit test of
X will not be rebuilt but will still be present in storage/X, so will
be run.
unittest/storage/maria/ma_control_file-t.c:
Making the test fit the mytap framework (return all the way up
the stack instead of assert(); use the mytap functions plan(), ok() etc).
Adding test of file too short/long.
unittest/storage/maria/Makefile.am:
a_control_file-t is added to the Maria unit tests.
Later, older tests (ma_test1 etc) could also move here.
unittest/storage/Makefile.am:
New BitKeeper file ``unittest/storage/Makefile.am''
2006-09-11 16:12:31 +02:00
|
|
|
CLEANFILES = test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA?
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
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 $@
|
|
|
|
|
|
|
|
# Don't update the files from bitkeeper
|
|
|
|
%::SCCS/s.%
|