~drizzle-trunk/drizzle/development

Committer: Lee Bieber
Date: 2011-02-11 02:00:55 UTC
mfrom: (2155.1.3 build)
Revision ID: kalebral@gmail.com-20110211020055-xck466i0geihtgc8

Merge Stewart - moves mark_transaction_to_rollback to be a method in Session
Merge Vijay - 715789: test-drizzle, test-jp etc dont run check
Merge Stewart - 565053: Fork to background

files added:
drizzled/daemon.c

files modified:
drizzled/drizzled.cc

drizzled/drizzled.h

drizzled/identifier/schema.cc

drizzled/include.am

drizzled/main.cc

drizzled/session.cc

drizzled/session.h

drizzled/sql_table.cc

drizzled/table.cc

plugin/haildb/haildb_engine.cc

plugin/innobase/handler/ha_innodb.cc

plugin/storage_engine_api_tester/storage_engine_api_tester.cc

tests/include.am

Show diffs side-by-side

added added

removed removed

drizzled/table.cc

namespace drizzled

{

extern pid_t current_pid;

extern plugin::StorageEngine *heap_engine;

extern plugin::StorageEngine *myisam_engine;

Older »