← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/schema.cc

Merge in change for catalog to be displayed properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/schema.cc
27
27
#include "drizzled/current_session.h"
28
28
#include "drizzled/internal/my_sys.h"
29
29
 
 
30
#include "drizzled/util/backtrace.h"
 
31
 
30
32
#include <algorithm>
31
33
#include <sstream>
32
34
#include <cstdio>
121
123
 
122
124
SchemaIdentifier::SchemaIdentifier(const std::string &db_arg) :
123
125
  db(db_arg),
124
 
  db_path("")
 
126
  db_path(""),
 
127
  catalog("LOCAL")
125
128
{ 
 
129
#if 0
 
130
  string::size_type lastPos= db.find_first_of('/', 0);
 
131
 
 
132
  if (lastPos != std::string::npos) 
 
133
  {
 
134
    catalog= db.substr(0, lastPos);
 
135
    db.erase(0, lastPos + 1);
 
136
  }
 
137
#endif
 
138
 
126
139
  if (not db_arg.empty())
127
140
  {
128
141
    drizzled::build_schema_filename(db_path, db);