← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

  • Committer: Jay Pipes
  • Date: 2010-04-08 16:27:25 UTC
  • mfrom: (1405.6.10 replication-pairs)
  • mto: This revision was merged to the branch mainline in revision 1457.
  • Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
255
255
                              drizzled/memory/sql_alloc.h \
256
256
                              drizzled/memory/multi_malloc.h \
257
257
                              drizzled/memory/root.h \
258
 
                              drizzled/my_getopt.h \
 
258
                              drizzled/option.h \
259
259
                              drizzled/my_hash.h \
260
 
                              drizzled/my_time.h \
261
 
                              drizzled/my_tree.h \
262
 
                              drizzled/my_var.h \
 
260
                              drizzled/drizzle_time.h \
 
261
                              drizzled/tree.h \
 
262
                              drizzled/var.h \
263
263
                              drizzled/name_resolution_context.h \
264
264
                              drizzled/name_resolution_context_state.h \
265
265
                              drizzled/named_savepoint.h \
307
307
                              drizzled/plugin/query_cache.h \
308
308
                              drizzled/plugin/query_rewrite.h \
309
309
                              drizzled/plugin/registry.h \
 
310
                              drizzled/plugin/replication.h \
310
311
                              drizzled/plugin/scheduler.h \
311
312
                              drizzled/plugin/storage_engine.h \
312
313
                              drizzled/plugin/table_function.h \
634
635
                           drizzled/lookup_symbol.cc \
635
636
                           drizzled/my_getsystime.cc \
636
637
                           drizzled/my_hash.cc \
637
 
                           drizzled/my_time.cc \
638
 
                           drizzled/my_tree.cc \
 
638
                           drizzled/drizzle_time.cc \
 
639
                           drizzled/tree.cc \
639
640
                           drizzled/name_resolution_context_state.cc \
640
641
                           drizzled/natural_join_column.cc \
641
642
                           drizzled/optimizer/explain_plan.cc \
781
782
 
782
783
drizzled_libdynamic_array_la_SOURCES = drizzled/dynamic_array.cc
783
784
drizzled_liberror_la_SOURCES = drizzled/error.cc
784
 
drizzled_libgetopt_la_SOURCES = drizzled/my_getopt.cc
 
785
drizzled_libgetopt_la_SOURCES = drizzled/option.cc
785
786
drizzled_libtypelib_la_SOURCES = drizzled/typelib.cc
786
787
drizzled_libserialutil_la_SOURCES = drizzled/db.cc drizzled/table_proto_write.cc
787
788
drizzled_libserialutil_la_CXXFLAGS= ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS}