← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/catalog/instance.h

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/catalog/instance.h
24
24
#include <boost/thread/mutex.hpp>
25
25
#include <boost/make_shared.hpp>
26
26
 
27
 
#include <drizzled/message/catalog.h>
28
 
#include <drizzled/identifier/session.h>
 
27
#include "drizzled/message/catalog.h"
 
28
#include "drizzled/identifier/session.h"
29
29
 
30
30
namespace drizzled {
31
31
namespace catalog {