~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_protocol.cc

  • 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:
19
19
 */
20
20
 
21
21
 
22
 
#include <config.h>
 
22
#include "config.h"
23
23
#include <drizzled/gettext.h>
24
24
#include <drizzled/error.h>
25
25
#include <drizzled/query_id.h>
26
26
#include <drizzled/session.h>
27
 
#include <drizzled/internal/my_sys.h>
28
 
#include <drizzled/internal/m_string.h>
 
27
#include "drizzled/internal/my_sys.h"
 
28
#include "drizzled/internal/m_string.h"
29
29
#include <algorithm>
30
30
#include <iostream>
31
31
#include <boost/program_options.hpp>
32
32
#include <drizzled/module/option_map.h>
33
 
#include <drizzled/util/tokenize.h>
 
33
#include "drizzled/util/tokenize.h"
34
34
#include "drizzle_protocol.h"
35
35
 
36
36
namespace po= boost::program_options;