← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/plugin.am

  • Committer: Lee Bieber
  • Date: 2011-01-09 23:23:37 UTC
  • mfrom: (2067.1.2 build)
  • Revision ID: kalebral@gmail.com-20110109232337-bobns3ndxf1qerfw
Merge Andrews - fix bug 673833: Embedded SELECT inside UPDATE or DELETE can timeout without error
Merge Andrews - fix bug 700099: serveral issues with InnoDB settings

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/plugin.am
226
226
endif
227
227
 
228
228
plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
 
229
plugin_innobase_libinnobase_la_LDDADD= ${LTLIBAIO}
229
230
plugin_innobase_libinnobase_la_SOURCES= \
230
231
                                        plugin/innobase/btr/btr0btr.cc \
231
232
                                        plugin/innobase/btr/btr0cur.cc \