← Back to branch summary

~posulliv/drizzle/memcached_applier

« back to all changes in this revision

Viewing changes to drizzled/message/binlog_writer.cc

  • Committer: Jay Pipes
  • Date: 2009-08-03 14:23:22 UTC
  • mfrom: (1039.2.68 staging)
  • mto: This revision was merged to the branch mainline in revision 1078.
  • Revision ID: jpipes@serialcoder-20090803142322-1g67h7su9mocg9ig
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/binlog_writer.cc
19
19
#include <fcntl.h>
20
20
 
21
21
using namespace std;
22
 
using namespace google::protobuf::io;
 
22
using namespace google;
23
23
 
24
24
typedef std::map<std::string,std::string> Assign;
25
25
 
41
41
 
42
42
 
43
43
static void
44
 
write_query(CodedOutputStream* out,
 
44
write_query(protobuf::io::CodedOutputStream* out,
45
45
            unsigned long trans_id,
46
46
            const string& query,
47
47
            const Assign& assign)
122
122
 
123
123
  ostream os(&fb);
124
124
 
125
 
  ZeroCopyOutputStream* raw_output = new OstreamOutputStream(&os);
126
 
  CodedOutputStream* coded_output = new CodedOutputStream(raw_output);
 
125
  protobuf::io::ZeroCopyOutputStream* raw_output=
 
126
    new protobuf::io::OstreamOutputStream(&os);
 
127
  protobuf::io::CodedOutputStream* coded_output=
 
128
    new protobuf::io::CodedOutputStream(raw_output);
127
129
 
128
130
  stringstream sout;
129
131
  sout << ioutil::join(" ", &argv[optind], &argv[argc]);