← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/transaction_log_reader.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/transaction_log_reader.h
40
40
 
41
41
#include "transaction_log.h"
42
42
 
43
 
#include <drizzled/server_includes.h>
44
43
#include <drizzled/plugin/transaction_reader.h>
45
44
 
46
45
/**
74
73
            drizzled::message::Transaction *to_fill);
75
74
};
76
75
 
77
 
#endif /* DRIZZLE_PLUGIN_TRANSACTION_LOG_READER_H */
 
76
#endif /* PLUGIN_TRANSACTION_LOG_TRANSACTION_LOG_READER_H */