← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-161

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Continuous Integration
  • Date: 2012-10-21 00:11:30 UTC
  • mfrom: (2603.1.1 drizzle-7.2)
  • Revision ID: ci@drizzle.org-20121021001130-jgfuk080sn9c4c21
Merge lp:~brianaker/drizzle/bootstrap/ Build: jenkins-Drizzle-Builder-86

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
2274
2274
  btr_search_enabled= not vm.count("disable-adaptive-hash-index");
2275
2275
 
2276
2276
  /* Hafta do this here because we need to late-bind the default value */
2277
 
  innobase_data_home_dir= vm.count("data-home-dir") ? vm["data-home-dir"].as<string>() : getDataHome().file_string();
 
2277
  innobase_data_home_dir= vm.count("data-home-dir") ? vm["data-home-dir"].as<string>() : getDataHome().string();
2278
2278
 
2279
2279
  if (vm.count("data-file-path"))
2280
2280
  {
2413
2413
  }
2414
2414
  else
2415
2415
  {
2416
 
    innobase_log_group_home_dir= getDataHome().file_string();
 
2416
    innobase_log_group_home_dir= getDataHome().string();
2417
2417
  }
2418
2418
 
2419
2419
  ret = (bool)
7460
7460
    /* Note that we do not know the access time of the table,
7461
7461
    nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
7462
7462
 
7463
 
    if (os_file_get_status(get_status_path.file_string().c_str(), &stat_info)) {
 
7463
    if (os_file_get_status(get_status_path.string().c_str(), &stat_info)) {
7464
7464
      stats.create_time = (ulong) stat_info.ctime;
7465
7465
    }
7466
7466
  }