← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Jay Pipes
  • Date: 2009-04-10 05:31:39 UTC
  • mto: (971.1.47 mordred)
  • mto: This revision was merged to the branch mainline in revision 990.
  • Revision ID: jpipes@serialcoder-20090410053139-beat1rbcopkcgc4n
Changes libserialize to libdrizzledmessage per ML discussion.  All GPB messages are now in the drizzled::message namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
20
20
#include CINTTYPES_H
21
21
#include <string>
22
22
#include <fstream>
23
 
#include <drizzled/serialize/serialize.h>
 
23
#include <drizzled/message/schema.pb.h>
24
24
using namespace std;
25
25
#include <drizzled/server_includes.h>
26
26
#include <mysys/mysys_err.h>
177
177
                             const char *path, const char *name,
178
178
                             HA_CREATE_INFO *create)
179
179
{
180
 
  drizzle::Schema db;
 
180
  drizzled::message::Schema db;
181
181
  char schema_file_tmp[FN_REFLEN];
182
182
  string schema_file(path);
183
183
 
220
220
 
221
221
int load_db_opt(Session *session, const char *path, HA_CREATE_INFO *create)
222
222
{
223
 
  drizzle::Schema db;
 
223
  drizzled::message::Schema db;
224
224
  string buffer;
225
225
 
226
226
  memset(create, 0, sizeof(*create));