← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

  • Committer: Lee Bieber
  • Date: 2011-04-13 23:47:18 UTC
  • mfrom: (2276.1.2 build)
  • Revision ID: kalebral@gmail.com-20110413234718-uc6emsr6ms1szt4c
Merge Olaf - Refactor Program Options usage
Merge Andrew - 748064: Xtrabackup breaks trunk in GCC 4.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
3176
3176
 
3177
3177
  /* Inverted Booleans */
3178
3178
 
3179
 
  innobase_adaptive_hash_index= (vm.count("disable-adaptive-hash-index")) ? false : true;
3180
 
  srv_adaptive_flushing= (vm.count("disable-adaptive-flushing")) ? false : true;
3181
 
  innobase_use_checksums= (vm.count("disable-checksums")) ? false : true;
3182
 
  innobase_use_doublewrite= (vm.count("disable-doublewrite")) ? false : true;
3183
 
  innobase_print_verbose_log= (vm.count("disable-print-verbose-log")) ? false : true;
3184
 
  srv_use_sys_malloc= (vm.count("use-internal-malloc")) ? false : true;
 
3179
  innobase_adaptive_hash_index= not vm.count("disable-adaptive-hash-index");
 
3180
  srv_adaptive_flushing= not vm.count("disable-adaptive-flushing");
 
3181
  innobase_use_checksums= not vm.count("disable-checksums");
 
3182
  innobase_use_doublewrite= not vm.count("disable-doublewrite");
 
3183
  innobase_print_verbose_log= not vm.count("disable-print-verbose-log");
 
3184
  srv_use_sys_malloc= not vm.count("use-internal-malloc");
3185
3185
 
3186
3186
 
3187
3187
  ib_err_t err;
3275
3275
  if (err != DB_SUCCESS)
3276
3276
    goto haildb_error;
3277
3277
 
3278
 
  if (vm.count("flush-method") != 0)
 
3278
  if (vm.count("flush-method"))
3279
3279
  {
3280
3280
    err= ib_cfg_set_text("flush_method", 
3281
3281
                         vm["flush-method"].as<string>().c_str());
3384
3384
                                                  innobase_file_format_name,
3385
3385
                                                  haildb_file_format_name_validate));
3386
3386
  context.registerVariable(new sys_var_constrained_value_readonly<uint32_t>("flush_log_at_trx_commit", srv_flush_log_at_trx_commit));
3387
 
  context.registerVariable(new sys_var_const_string_val("flush_method",
3388
 
                                                vm.count("flush-method") ?  vm["flush-method"].as<string>() : ""));
 
3387
  context.registerVariable(new sys_var_const_string_val("flush_method", vm["flush-method"].as<string>()));
3389
3388
  context.registerVariable(new sys_var_constrained_value_readonly<uint32_t>("force_recovery", innobase_force_recovery));
3390
 
  context.registerVariable(new sys_var_const_string_val("log_group_home_dir",
3391
 
                                                vm.count("log-group-home-dir") ?  vm["log-group-home-dir"].as<string>() : ""));
 
3389
  context.registerVariable(new sys_var_const_string_val("log_group_home_dir", vm["log-group-home-dir"].as<string>()));
3392
3390
  context.registerVariable(new sys_var_constrained_value<int64_t>("log_file_size", haildb_log_file_size));
3393
3391
  context.registerVariable(new sys_var_constrained_value_readonly<unsigned int>("log_files_in_group", haildb_log_files_in_group));
3394
3392
  context.registerVariable(new sys_var_constrained_value_readonly<unsigned int>("lock_wait_timeout", innobase_lock_wait_timeout));