← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.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/sql_load.cc
1
1
/* Copyright (C) 2000-2006 MySQL AB
 
2
   Copyright (C) 2011 Stewart Smith
2
3
 
3
4
   This program is free software; you can redistribute it and/or modify
4
5
   it under the terms of the GNU General Public License as published by
20
21
 
21
22
#include <drizzled/sql_load.h>
22
23
#include <drizzled/error.h>
23
 
#include <drizzled/data_home.h>
 
24
#include <drizzled/catalog/local.h>
24
25
#include <drizzled/session.h>
25
26
#include <drizzled/sql_base.h>
26
27
#include <drizzled/field/epoch.h>
263
264
  }
264
265
 
265
266
  fs::path to_file(ex->file_name);
266
 
  fs::path target_path(fs::system_complete(getDataHomeCatalog()));
 
267
  fs::path target_path(fs::system_complete(catalog::local_identifier().getPath()));
267
268
  if (not to_file.has_root_directory())
268
269
  {
269
270
    int count_elements= 0;