~drizzle-trunk/drizzle/development

MErge Monty (this includes Innodb fix for Stewart).

added added

removed removed

215

plugin/innobase/handler/status_function.h \

216

plugin/innobase/handler/data_dictionary.h

217

218

if BUILD_INNOBASE_PLUGIN

218

219

noinst_LTLIBRARIES+= \

219

plugin/innobase/libinnobase.la plugin/innobase/libpars.la

220

plugin/innobase/libinnobase.la \

221

plugin/innobase/libpars.la

222

endif

223

220

224

plugin_innobase_libinnobase_la_CFLAGS= ${AM_CFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE

221

225

plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE

222

226

plugin_innobase_libinnobase_la_SOURCES= \