← 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: Lee Bieber
  • Date: 2011-04-18 21:48:09 UTC
  • mfrom: (2280.2.3 build)
  • Revision ID: kalebral@gmail.com-20110418214809-dsdfrc8f90a9p2x1
Merge Olaf - code refactor and pruning dead functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
2171
2171
 
2172
2172
  /* Inverted Booleans */
2173
2173
 
2174
 
  innobase_use_checksums= (vm.count("disable-checksums")) ? false : true;
2175
 
  innobase_use_doublewrite= (vm.count("disable-doublewrite")) ? false : true;
2176
 
  srv_adaptive_flushing= (vm.count("disable-adaptive-flushing")) ? false : true;
2177
 
  srv_use_sys_malloc= (vm.count("use-internal-malloc")) ? false : true;
2178
 
  srv_use_native_aio= (vm.count("disable-native-aio")) ? false : true;
2179
 
  support_xa= (vm.count("disable-xa")) ? false : true;
2180
 
  btr_search_enabled= (vm.count("disable-adaptive-hash-index")) ? false : true;
2181
 
 
 
2174
  innobase_use_checksums= not vm.count("disable-checksums");
 
2175
  innobase_use_doublewrite= not vm.count("disable-doublewrite");
 
2176
  srv_adaptive_flushing= not vm.count("disable-adaptive-flushing");
 
2177
  srv_use_sys_malloc= not vm.count("use-internal-malloc");
 
2178
  srv_use_native_aio= not vm.count("disable-native-aio");
 
2179
  support_xa= not vm.count("disable-xa");
 
2180
  btr_search_enabled= not vm.count("disable-adaptive-hash-index");
2182
2181
 
2183
2182
  /* Hafta do this here because we need to late-bind the default value */
2184
 
  if (vm.count("data-home-dir"))
2185
 
  {
2186
 
    innobase_data_home_dir= vm["data-home-dir"].as<string>();
2187
 
  }
2188
 
  else
2189
 
  {
2190
 
    innobase_data_home_dir= getDataHome().file_string();
2191
 
  }
2192
 
 
 
2183
  innobase_data_home_dir= vm.count("data-home-dir") ? vm["data-home-dir"].as<string>() : getDataHome().file_string();
2193
2184
 
2194
2185
  if (vm.count("data-file-path"))
2195
2186
  {