← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/utilities/transaction_manager.h

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/utilities/transaction_manager.h
26
26
#ifndef PLUGIN_TRANSACTION_LOG_UTILITIES_TRANSACTION_MANAGER_H
27
27
#define PLUGIN_TRANSACTION_LOG_UTILITIES_TRANSACTION_MANAGER_H
28
28
 
29
 
#include "drizzled/message/transaction.pb.h"
 
29
#include <drizzled/message/transaction.pb.h>
30
30
#include <string>
31
31
#include <vector>
32
32
#include <boost/unordered_map.hpp>