← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-08-26 03:17:31 UTC
  • mfrom: (1124 staging)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: osullivan.padraig@gmail.com-20090826031731-at2as3ledixngra3
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
36
36
#include <drizzled/replication_services.h>
37
37
#include <drizzled/message/schema.pb.h>
38
38
 
 
39
using namespace drizzled;
 
40
 
39
41
extern drizzled::ReplicationServices replication_services;
40
42
 
41
43
#define MY_DB_OPT_FILE "db.opt"
64
66
 
65
67
const CHARSET_INFO *get_default_db_collation(const char *db_name)
66
68
{
67
 
  drizzled::message::Schema db;
 
69
  message::Schema db;
68
70
 
69
71
  get_database_metadata(db_name, &db);
70
72
 
96
98
                             const char *path, const char *name,
97
99
                             HA_CREATE_INFO *create)
98
100
{
99
 
  drizzled::message::Schema db;
 
101
  message::Schema db;
100
102
  char schema_file_tmp[FN_REFLEN];
101
103
  string schema_file(path);
102
104
 
137
139
  return 0;
138
140
}
139
141
 
140
 
int get_database_metadata(const char *dbname, drizzled::message::Schema *db)
 
142
int get_database_metadata(const char *dbname, message::Schema *db)
141
143
{
142
144
  char db_opt_path[FN_REFLEN];
143
145
  size_t length;