← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/include.am

  • Committer: Brian Aker
  • Date: 2010-05-26 21:49:18 UTC
  • mto: This revision was merged to the branch mainline in revision 1568.
  • Revision ID: brian@gaz-20100526214918-8kdibq48e9lnyr6t
https://launchpad.net/bugs/586009
This fixes bug 586009, increases the size of the log files so that the UNION
test doesn't hit Innodb's default limit. Increases the size of the initial
Innodb data file, and fixes one case where an empty string on error was
causing a crash on OSX.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/include.am
13
13
# 
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
MESSAGE_DIR=drizzled/message
19
19
MESSAGE_LDADD= \
22
22
               ${LIBUUID} \
23
23
               ${LTLIBINTL} \
24
24
               $(GCOV_LIBS) \
25
 
                drizzled/internal/libinternal.la
 
25
               ${top_builddir}/gnulib/libgnu.la
26
26
 
27
27
MESSAGE_AM_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS}
28
28
 
32
32
                  drizzled/message/table_raw_reader \
33
33
                  drizzled/message/table_reader \
34
34
                  drizzled/message/table_writer \
 
35
                  drizzled/message/transaction_reader \
35
36
                  drizzled/message/transaction_writer
36
37
 
37
38
lib_LTLIBRARIES += drizzled/message/libdrizzledmessage.la
39
40
drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
40
41
 
41
42
drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc
42
 
drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la
 
43
drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS)
43
44
 
44
 
nobase_dist_include_HEADERS+= drizzled/message/statement_transform.h \
45
 
                                                drizzled/message/schema.h \
46
 
                                                drizzled/message/table.h
 
45
nobase_dist_include_HEADERS+= drizzled/message/statement_transform.h
47
46
 
48
47
nodist_drizzled_message_libdrizzledmessage_la_SOURCES = \
49
 
                                                        drizzled/message/event.pb.cc \
50
48
                                                        drizzled/message/engine.pb.cc \
51
49
                                                        drizzled/message/transaction.pb.cc \
52
50
                                                        drizzled/message/schema.pb.cc \
53
 
                                                        drizzled/message/resultset.pb.cc \
54
51
                                                        drizzled/message/table.pb.cc
55
52
 
56
53
nobase_nodist_include_HEADERS+= \
57
 
                                drizzled/message/event.pb.h \
58
54
                                drizzled/message/engine.pb.h \
59
55
                                drizzled/message/transaction.pb.h \
60
56
                                drizzled/message/schema.pb.h \
61
 
                                drizzled/message/resultset.pb.h \
62
57
                                drizzled/message/table.pb.h 
63
58
 
64
59
noinst_HEADERS+= \
65
 
                drizzled/message/ioutil.h 
 
60
                drizzled/message/ioutil.h \
 
61
                drizzled/message/all.h
 
62
 
66
63
 
67
64
drizzled_message_schema_reader_SOURCES =  drizzled/message/schema_reader.cc
68
65
drizzled_message_schema_reader_LDADD = ${MESSAGE_LDADD}
81
78
drizzled_message_table_raw_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
82
79
 
83
80
drizzled_message_table_writer_SOURCES =  drizzled/message/table_writer.cc
84
 
drizzled_message_table_writer_LDADD = ${MESSAGE_LDADD} ${BOOST_LIBS}
 
81
drizzled_message_table_writer_LDADD = ${MESSAGE_LDADD}
85
82
drizzled_message_table_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS}
86
83
 
87
84
drizzled_message_transaction_writer_SOURCES =  drizzled/message/transaction_writer.cc
88
85
drizzled_message_transaction_writer_LDADD = ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la
89
86
drizzled_message_transaction_writer_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
90
87
 
 
88
drizzled_message_transaction_reader_SOURCES =  drizzled/message/transaction_reader.cc
 
89
drizzled_message_transaction_reader_LDADD = ${MESSAGE_LDADD} ${top_builddir}/drizzled/algorithm/libhash.la ${top_builddir}/drizzled/util/libutil.la
 
90
drizzled_message_transaction_reader_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
 
91
 
91
92
EXTRA_DIST += \
92
 
                ${MESSAGE_DIR}/event.proto \
93
93
                ${MESSAGE_DIR}/engine.proto \
94
94
                ${MESSAGE_DIR}/schema.proto \
95
95
                ${MESSAGE_DIR}/table.proto \
96
 
                ${MESSAGE_DIR}/resultset.proto \
97
96
                ${MESSAGE_DIR}/transaction.proto
98
97
 
99
98
BUILT_SOURCES += \
100
 
                ${MESSAGE_DIR}/event.pb.h \
101
99
                ${MESSAGE_DIR}/engine.pb.h \
102
100
                ${MESSAGE_DIR}/schema.pb.h \
103
101
                ${MESSAGE_DIR}/table.pb.h \
104
 
                ${MESSAGE_DIR}/resultset.pb.h \
105
102
                ${MESSAGE_DIR}/transaction.pb.h
106
103
 
107
104
CLEANFILES += \
108
 
            ${MESSAGE_DIR}/event.pb.h \
109
 
            ${MESSAGE_DIR}/event.pb.cc \
110
105
            ${MESSAGE_DIR}/engine.pb.h \
111
106
            ${MESSAGE_DIR}/engine.pb.cc \
112
107
            ${MESSAGE_DIR}/schema.pb.h \
113
108
            ${MESSAGE_DIR}/schema.pb.cc \
114
109
            ${MESSAGE_DIR}/table.pb.h \
115
110
            ${MESSAGE_DIR}/table.pb.cc \
116
 
            ${MESSAGE_DIR}/resultset.pb.h \
117
 
            ${MESSAGE_DIR}/resultset.pb.cc \
118
111
            ${MESSAGE_DIR}/transaction.pb.h \
119
112
            ${MESSAGE_DIR}/transaction.pb.cc
120
113