← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.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:
plugin/innobase/handler/ha_innodb.cc
3
3
Copyright (C) 2000, 2010, MySQL AB & Innobase Oy. All Rights Reserved.
4
4
Copyright (C) 2008, 2009 Google Inc.
5
5
Copyright (C) 2009, Percona Inc.
 
6
Copyright (C) 2011, Stewart Smith
6
7
 
7
8
Portions of this file contain modifications contributed and copyrighted by
8
9
Google, Inc. Those modifications are gratefully acknowledged and are described
50
51
#include <drizzled/plugin.h>
51
52
#include <drizzled/show.h>
52
53
#include <drizzled/data_home.h>
 
54
#include <drizzled/catalog/local.h>
53
55
#include <drizzled/error.h>
54
56
#include <drizzled/field.h>
55
57
#include <drizzled/charset.h>
7287
7289
 
7288
7290
    prebuilt->trx->op_info = "returning various info to MySQL";
7289
7291
 
7290
 
    fs::path get_status_path(getDataHomeCatalog());
 
7292
    fs::path get_status_path(catalog::local_identifier().getPath());
7291
7293
    get_status_path /= ib_table->name;
7292
7294
    fs::change_extension(get_status_path, "dfe");
7293
7295