← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: lbieber
  • Date: 2010-10-07 14:55:42 UTC
  • mfrom: (1813.2.17 boost-fs-path-work)
  • mto: This revision was merged to the branch mainline in revision 1820.
  • Revision ID: lbieber@orisndriz08-20101007145542-fiwu5dd53lfrd0hr
Merge Monty - Bug 655294: load_data() function returns null if file is invalid 
Merge Monty - Bug 655342: select into outfile creates a garbage file on no results

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
255
255
 
256
256
  if (not opt_help)
257
257
  {
258
 
    if (chdir(getDataHome().c_str()))
 
258
    if (chdir(getDataHome().file_string().c_str()))
259
259
    {
260
260
      errmsg_printf(ERRMSG_LVL_ERROR,
261
261
                    _("Data directory %s does not exist\n"),
262
 
                    getDataHome().c_str());
 
262
                    getDataHome().file_string().c_str());
263
263
      unireg_abort(1);
264
264
    }
265
265
    if (mkdir("local", 0700))
270
270
    {
271
271
      errmsg_printf(ERRMSG_LVL_ERROR,
272
272
                    _("Local catalog %s/local does not exist\n"),
273
 
                    getDataHome().c_str());
 
273
                    getDataHome().file_string().c_str());
274
274
      unireg_abort(1);
275
275
    }
276
 
    /* TODO: This is a hack until we can properly support std::string in sys_var*/
277
 
    char **data_home_ptr= getDatadirPtr();
278
 
    fs::path full_data_home_path(fs::system_complete(fs::path(getDataHome())));
279
 
    std::string full_data_home(full_data_home_path.file_string());
280
 
    *data_home_ptr= new char[full_data_home.size()+1] ();
281
 
    memcpy(*data_home_ptr, full_data_home.c_str(), full_data_home.size());
 
276
 
 
277
    full_data_home= fs::system_complete(getDataHome());
282
278
    getDataHomeCatalog()= "./";
283
279
    getDataHome()= "../";
284
280
  }
319
315
    select_thread_in_use=0;
320
316
    (void) pthread_kill(signal_thread, SIGTERM);
321
317
 
322
 
    (void) unlink(pidfile_name);        // Not needed anymore
 
318
    (void) unlink(pid_file.file_string().c_str());      // Not needed anymore
323
319
 
324
320
    exit(1);
325
321
  }