← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/Makefile.am

  • Committer: Stewart Smith
  • Date: 2008-11-21 16:06:07 UTC
  • mto: This revision was merged to the branch mainline in revision 593.
  • Revision ID: stewart@flamingspork.com-20081121160607-n6gdlt013spuo54r
remove mysql_frm_type
and fix engines to return correct value from delete_table when table doesn't exist.
(it should be ENOENT).

Also fix up some tests that manipulated frm files by hand. These tests are no longer valid and will need to be rewritten in the not too distant future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/Makefile.am
1
 
# vim:ft=automake
2
1
# Copyright (C) 2005-2006 MySQL AB
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
14
13
# along with this program; if not, write to the Free Software
15
14
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
16
15
 
17
 
test_archive_LDADD = \
18
 
                        $(top_builddir)/plugin/archive/libazio.la \
19
 
                        $(LDADD) \
20
 
                        $(BOOST_LIBS) \
21
 
                        $(LIBINTL) \
22
 
                        $(LTLIBZ)
23
 
 
24
 
if BUILD_ARCHIVE_PLUGIN
25
 
noinst_LTLIBRARIES+=  plugin/archive/libazio.la
26
 
endif
27
 
noinst_HEADERS+= \
28
 
                 plugin/archive/azio.h
29
 
plugin_archive_libazio_la_SOURCES= \
30
 
                        plugin/archive/azio.cc
31
 
plugin_archive_libazio_la_LIBADD= drizzled/internal/libinternal.la
32
 
 
33
 
 
34
 
if BUILD_ARCHIVE_PLUGIN
35
 
noinst_PROGRAMS+= \
36
 
                  plugin/archive/archive_test \
37
 
                  plugin/archive/archive_reader \
38
 
                  plugin/archive/archive_performance \
39
 
                  plugin/archive/concurrency_test
40
 
endif
41
 
 
42
 
plugin_archive_archive_performance_SOURCES= plugin/archive/archive_performance.cc
43
 
plugin_archive_archive_performance_LDADD= $(test_archive_LDADD)
44
 
 
45
 
plugin_archive_archive_test_SOURCES= plugin/archive/archive_test.cc 
46
 
plugin_archive_archive_test_LDADD= $(test_archive_LDADD)
47
 
 
48
 
plugin_archive_archive_reader_SOURCES= plugin/archive/archive_reader.cc
49
 
plugin_archive_archive_reader_LDADD= $(test_archive_LDADD) ${BOOST_LIBS}
50
 
plugin_archive_archive_reader_CXXFLAGS= ${AM_CXXFLAGS} ${BOOSTSKIP_WARNINGS}
51
 
 
52
 
plugin_archive_concurrency_test_SOURCES= plugin/archive/concurrency_test.cc
53
 
plugin_archive_concurrency_test_LDADD= $(test_archive_LDADD)
54
 
 
55
 
valgrind-test: plugin/archive/archive_test plugin/archive/archive_performance plugin/archive/concurrency_test
56
 
        libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  ./plugin/archive/concurrency_test
57
 
        libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  ./plugin/archive/archive_test
 
16
#called from the top level Makefile
 
17
 
 
18
 
 
19
MYSQLDATAdir =          $(localstatedir)
 
20
MYSQLSHAREdir =         $(pkgdatadir)
 
21
MYSQLBASEdir=           $(prefix)
 
22
MYSQLLIBdir=            $(pkglibdir)
 
23
pkgplugindir =          $(pkglibdir)/plugin
 
24
 
 
25
LDADD = $(LIBINTL)
 
26
 
 
27
DEFS =                  @DEFS@ -DHAVE_DRIZZLE_CONFIG_H
 
28
 
 
29
noinst_HEADERS =        ha_archive.h azio.h
 
30
noinst_PROGRAMS =       archive_test archive_reader archive_performance concurrency_test
 
31
 
 
32
EXTRA_LTLIBRARIES =     ha_archive.la
 
33
pkglib_LTLIBRARIES =    @plugin_archive_shared_target@
 
34
ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) $(LDADD)
 
35
ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DDRIZZLE_DYNAMIC_PLUGIN
 
36
ha_archive_la_CFLAGS =  $(AM_CFLAGS) -DDRIZZLE_DYNAMIC_PLUGIN 
 
37
ha_archive_la_SOURCES = ha_archive.cc azio.c
 
38
 
 
39
 
 
40
EXTRA_LIBRARIES =       libarchive.a
 
41
noinst_LIBRARIES =      @plugin_archive_static_target@
 
42
libarchive_a_CXXFLAGS = $(AM_CXXFLAGS) 
 
43
libarchive_a_CFLAGS =   $(AM_CFLAGS) 
 
44
libarchive_a_SOURCES =  ha_archive.cc azio.c
 
45
 
 
46
archive_performance_SOURCES =   archive_performance.c azio.c
 
47
archive_performance_CFLAGS =    $(AM_CFLAGS) 
 
48
archive_performance_LDADD =     $(top_builddir)/mysys/libmysys.la \
 
49
                        $(top_builddir)/mystrings/libmystrings.la \
 
50
                        $(LDADD) \
 
51
                        -lz
 
52
archive_performance_LDFLAGS =
 
53
 
 
54
archive_test_SOURCES =  archive_test.c azio.c
 
55
archive_test_CFLAGS =   $(AM_CFLAGS) 
 
56
archive_test_LDADD =    $(top_builddir)/mysys/libmysys.la \
 
57
                        $(top_builddir)/mystrings/libmystrings.la \
 
58
                        $(LDADD) \
 
59
                        -lz
 
60
archive_test_LDFLAGS =
 
61
 
 
62
archive_reader_SOURCES = archive_reader.c azio.c
 
63
archive_reader_CFLAGS = $(AM_CFLAGS) 
 
64
archive_reader_LDADD =  $(top_builddir)/mysys/libmysys.la \
 
65
                        $(top_builddir)/mystrings/libmystrings.la \
 
66
                        $(LDADD) \
 
67
                        -lz
 
68
archive_reader_LDFLAGS =
 
69
 
 
70
concurrency_test_SOURCES = concurrency_test.c azio.c
 
71
concurrency_test_CFLAGS =       $(AM_CFLAGS) 
 
72
concurrency_test_LDADD =        $(top_builddir)/mysys/libmysys.la \
 
73
                        $(top_builddir)/mystrings/libmystrings.la \
 
74
                        $(top_builddir)/libdrizzle/libdrizzle.la \
 
75
                        $(LDADD) \
 
76
                        -lz
 
77
concurrency_test_LDFLAGS =
 
78
 
 
79
valgrind-test: archive_test archive_performance
 
80
        libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  ./concurrency_test
 
81
        libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  ./archive_test
58
82
        libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  ./archive_performance
 
83
 
 
84
EXTRA_DIST =            plug.in