← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/message/schema_reader.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/message/schema_reader.cc
21
21
#include <fstream>
22
22
#include <string>
23
23
#include <drizzled/message/schema.pb.h>
 
24
 
24
25
using namespace std;
 
26
using namespace drizzled;
 
27
 
25
28
 
26
29
/*
27
30
  Written from Google proto example
28
31
*/
29
32
 
30
 
static void printSchema(const drizzled::message::Schema *schema)
 
33
static void printSchema(const message::Schema *schema)
31
34
{
32
35
  cout << "CREATE SCHEMA `" << schema->name() << "` ";
33
36
  if (schema->has_collation())
44
47
    return -1;
45
48
  }
46
49
 
47
 
  drizzled::message::Schema schema;
 
50
  message::Schema schema;
48
51
 
49
52
  {
50
53
    // Read the existing address book.