← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Stewart Smith
  • Date: 2011-12-27 06:49:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2485.
  • Revision ID: stewart@flamingspork.com-20111227064923-tw8ccr27tpx98waq
Partially move towards using LOCAL catalog in all path generation by removing getDataHomeCatalog() and instead using catalog::local_identifier() around the place. We do a bit of prep work in the schema engine too. Next step is to remove chdir to 'local' and generate local as part of path to all objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
27
27
#include <boost/filesystem.hpp>
28
28
#include <boost/ptr_container/ptr_container.hpp>
29
29
#include <drizzled/copy_field.h>
30
 
#include <drizzled/data_home.h>
 
30
#include <drizzled/catalog/local.h>
31
31
#include <drizzled/diagnostics_area.h>
32
32
#include <drizzled/display.h>
33
33
#include <drizzled/drizzled.h>
996
996
 
997
997
  if (not to_file.has_root_directory())
998
998
  {
999
 
    target_path= fs::system_complete(getDataHomeCatalog());
 
999
    target_path= fs::system_complete(catalog::local_identifier().getPath());
1000
1000
    util::string::ptr schema(session.schema());
1001
1001
    if (not schema->empty())
1002
1002
    {