← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/transaction_log.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/transaction_log.h
42
42
#ifndef DRIZZLE_PLUGIN_TRANSACTION_LOG_H
43
43
#define DRIZZLE_PLUGIN_TRANSACTION_LOG_H
44
44
 
45
 
#include <drizzled/server_includes.h>
46
45
#include <drizzled/atomics.h>
47
46
#include <drizzled/replication_services.h>
48
47
#include <drizzled/plugin/transaction_replicator.h>
137
136
                                              std::string &out_filename) const;
138
137
};
139
138
 
140
 
#endif /* DRIZZLE_PLUGIN_TRANSACTION_LOG_H */
 
139
#endif /* PLUGIN_TRANSACTION_LOG_TRANSACTION_LOG_H */