← 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: mordred
  • Date: 2010-09-26 01:35:56 UTC
  • mto: (1793.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: mordred@orisndriz09-20100926013556-vipwpaow2bgtmu1i
Now lets get the proper values into these bad boys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
1837
1837
  {
1838
1838
    innobase_data_home_dir= strdup(vm["data-home-dir"].as<string>().c_str());
1839
1839
  }
1840
 
 
1841
1840
  else
1842
1841
  {
1843
 
    innobase_data_home_dir= NULL;
 
1842
    innobase_data_home_dir= strdup(getDataHome().c_str());
1844
1843
  }
1845
1844
 
1846
1845
  if (vm.count("fast-shutdown"))
2128
2127
 
2129
2128
  /* The default dir for data files is the datadir of MySQL */
2130
2129
 
2131
 
  srv_data_home = (char *)(innobase_data_home_dir ? innobase_data_home_dir :
2132
 
                   getDataHome().c_str());
 
2130
  srv_data_home = (char *)innobase_data_home_dir;
2133
2131
 
2134
2132
  /* Set default InnoDB data file size to 10 MB and let it be
2135
2133
    auto-extending. Thus users can use InnoDB in >= 4.0 without having