← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Big merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
38
38
#include <drizzled/sql_parse.h>
39
39
#include <drizzled/item/cmpfunc.h>
40
40
#include <drizzled/session.h>
41
 
#include <drizzled/db.h>
42
41
#include <drizzled/item/create.h>
43
42
#include <drizzled/unireg.h>
44
43
#include "drizzled/temporal_format.h" /* For init_temporal_formats() */
1578
1577
  select_thread_in_use=1;
1579
1578
 
1580
1579
  if (chdir(drizzle_real_data_home) && !opt_help)
 
1580
  {
 
1581
    errmsg_printf(ERRMSG_LVL_ERROR, _("Data directory %s does not exist\n"), drizzle_real_data_home);
1581
1582
    unireg_abort(1);
 
1583
  }
1582
1584
  drizzle_data_home= drizzle_data_home_buff;
1583
1585
  drizzle_data_home[0]=FN_CURLIB;               // all paths are relative from here
1584
1586
  drizzle_data_home[1]=0;