← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
75
75
 
76
76
#include "drizzled/plugin/event_observer.h"
77
77
 
 
78
#include "drizzled/data_home.h"
 
79
 
78
80
#include "drizzled/message/cache.h"
79
81
 
80
82
#include "drizzled/visibility.h"
383
385
vector<string> defaults_file_list;
384
386
po::variables_map vm;
385
387
 
386
 
fs::path data_home(LOCALSTATEDIR);
387
 
fs::path full_data_home(LOCALSTATEDIR);
388
 
 
389
388
po::variables_map &getVariablesMap()
390
389
{
391
390
  return vm;
392
391
}
393
392
 
394
 
fs::path& getFullDataHome()
395
 
{
396
 
  return full_data_home;
397
 
}
398
 
 
399
 
fs::path& getDataHome()
400
 
{
401
 
  return data_home;
402
 
}
403
 
 
404
 
fs::path& getDataHomeCatalog()
405
 
{
406
 
  static fs::path data_home_catalog(getDataHome());
407
 
  return data_home_catalog;
408
 
}
409
 
 
410
 
 
 
393
 
411
394
/****************************************************************************
412
395
** Code to end drizzled
413
396
****************************************************************************/
1191
1174
  ("completion-type", po::value<uint32_t>(&global_system_variables.completion_type)->default_value(0)->notifier(&check_limits_completion_type),
1192
1175
  _("Default completion type."))
1193
1176
  ("core-file",  _("Write core on errors."))
1194
 
  ("datadir", po::value<fs::path>(&data_home),
 
1177
  ("datadir", po::value<fs::path>(&getDataHome()),
1195
1178
  _("Path to the database root."))
1196
1179
  ("default-storage-engine", po::value<string>(),
1197
1180
  _("Set the default storage engine for tables."))