← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
197
197
                              drizzled/gettext.h \
198
198
                              drizzled/global_charset_info.h \
199
199
                              drizzled/ha_statistics.h \
200
 
                              drizzled/ha_trx_info.h \
201
200
                              drizzled/cursor.h \
202
201
                              drizzled/handler_structs.h \
203
202
                              drizzled/hash.h \
313
312
                              drizzled/plugin/transaction_applier.h \
314
313
                              drizzled/plugin/transaction_reader.h \
315
314
                              drizzled/plugin/transaction_replicator.h \
 
315
                              drizzled/plugin/transactional_storage_engine.h \
 
316
                              drizzled/plugin/xa_storage_engine.h \
316
317
                              drizzled/plugin/version.h \
317
318
                              drizzled/pthread_globals.h \
318
319
                              drizzled/probes.h \
320
321
                              drizzled/query_id.h \
321
322
                              drizzled/records.h \
322
323
                              drizzled/replication_services.h \
 
324
                              drizzled/resource_context.h \
323
325
                              drizzled/security_context.h \
324
326
                              drizzled/select_create.h \
325
327
                              drizzled/select_dump.h \
387
389
                              drizzled/statement/show_create.h \
388
390
                              drizzled/statement/show_create_schema.h \
389
391
                              drizzled/statement/show_errors.h \
390
 
                              drizzled/statement/show_processlist.h \
391
 
                              drizzled/statement/show_status.h \
392
392
                              drizzled/statement/show_warnings.h \
393
393
                              drizzled/statement/start_transaction.h \
394
394
                              drizzled/statement/truncate.h \
413
413
                              drizzled/time_functions.h \
414
414
                              drizzled/tmp_table_param.h \
415
415
                              drizzled/transaction_services.h \
 
416
                              drizzled/transaction_context.h \
416
417
                              drizzled/tzfile.h \
417
418
                              drizzled/tztime.h \
418
419
                              drizzled/unique.h \
424
425
                              drizzled/utf8/unchecked.h \
425
426
                              drizzled/version.h \
426
427
                              drizzled/visibility.h \
427
 
                              drizzled/xid.h
 
428
                              drizzled/xid.h \
 
429
                              plugin/innobase/handler/status_function.h
428
430
 
429
431
lib_LTLIBRARIES+= drizzled/libdrizzled.la
430
432
drizzled_libdrizzled_la_LIBADD= \
457
459
                                 drizzled/cursor.cc \
458
460
                                 drizzled/decimal.cc \
459
461
                                 drizzled/diagnostics_area.cc \
460
 
                                 drizzled/drizzled.cc \
461
462
                                 drizzled/dtcollation.cc \
462
463
                                 drizzled/errmsg_print.cc \
463
464
                                 drizzled/field.cc \
586
587
                                 drizzled/function/units.cc \
587
588
                                 drizzled/function/user_var_as_out_param.cc \
588
589
                                 drizzled/ha_commands.cc \
589
 
                                 drizzled/ha_trx_info.cc \
590
590
                                 drizzled/hybrid_type_traits.cc \
591
591
                                 drizzled/hybrid_type_traits_decimal.cc \
592
592
                                 drizzled/hybrid_type_traits_integer.cc \
667
667
                                 drizzled/plugin/table_function.cc \
668
668
                                 drizzled/plugin/transaction_applier.cc \
669
669
                                 drizzled/plugin/transaction_replicator.cc \
 
670
                                 drizzled/plugin/transactional_storage_engine.cc \
 
671
                                 drizzled/plugin/xa_storage_engine.cc \
670
672
                                 drizzled/query_id.cc \
671
673
                                 drizzled/records.cc \
672
674
                                 drizzled/replication_services.cc \
 
675
                                 drizzled/resource_context.cc \
673
676
                                 drizzled/session.cc \
674
677
                                 drizzled/session_list.cc \
675
678
                                 drizzled/set_var.cc \
726
729
                                 drizzled/statement/show_create.cc \
727
730
                                 drizzled/statement/show_create_schema.cc \
728
731
                                 drizzled/statement/show_errors.cc \
729
 
                                 drizzled/statement/show_processlist.cc \
730
 
                                 drizzled/statement/show_status.cc \
731
732
                                 drizzled/statement/show_warnings.cc \
732
733
                                 drizzled/statement/start_transaction.cc \
733
734
                                 drizzled/statement/truncate.cc \