~daniel-nichter/drizzle/fix-slave-reconnect-bug-956200

« back to all changes in this revision

Viewing changes to drizzled/identifier/table.cc

  • Committer: Continuous Integration
  • Date: 2012-04-23 09:10:11 UTC
  • mfrom: (2546.1.6 drizzle-greenlake)
  • Revision ID: ci@drizzle.org-20120423091011-occ5xj26cv99opu6
modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
 
34
34
#include <drizzled/util/string.h>
35
35
#include <drizzled/util/tablename_to_filename.h>
 
36
#include <drizzled/catalog/local.h>
36
37
 
37
38
#include <algorithm>
38
39
#include <sstream>
183
184
 
184
185
std::string Table::build_table_filename(const std::string &in_db, const std::string &in_table_name, bool is_tmp)
185
186
{
186
 
  string in_path= util::tablename_to_filename(in_db) + FN_LIBCHAR;
 
187
  string in_path= drizzled::catalog::local_identifier().getPath();
 
188
  in_path+= FN_LIBCHAR + util::tablename_to_filename(in_db) + FN_LIBCHAR;
187
189
  return in_path + (is_tmp ? in_table_name : util::tablename_to_filename(in_table_name));
188
190
}
189
191