← 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-01-09 23:23:37 UTC
  • mfrom: (2067.1.2 build)
  • Revision ID: kalebral@gmail.com-20110109232337-bobns3ndxf1qerfw
Merge Andrews - fix bug 673833: Embedded SELECT inside UPDATE or DELETE can timeout without error
Merge Andrews - fix bug 700099: serveral issues with InnoDB settings

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
202
202
static purge_batch_constraint innodb_purge_batch_size;
203
203
typedef constrained_check<uint32_t, 1, 0> purge_threads_constraint;
204
204
static purge_threads_constraint innodb_n_purge_threads;
205
 
typedef constrained_check<uint16_t, 2, 0> trinary_constraint;
 
205
typedef constrained_check<uint32_t, 2, 0> trinary_constraint;
206
206
static trinary_constraint innodb_flush_log_at_trx_commit;
207
207
typedef constrained_check<unsigned int, 99, 0> max_dirty_pages_constraint;
208
208
static max_dirty_pages_constraint innodb_max_dirty_pages_pct;
251
251
/* Below we have boolean-valued start-up parameters, and their default
252
252
values */
253
253
 
254
 
typedef constrained_check<uint16_t, 2, 0> trinary_constraint;
 
254
typedef constrained_check<uint32_t, 2, 0> trinary_constraint;
255
255
static trinary_constraint innobase_fast_shutdown;
256
256
 
257
257
/* "innobase_file_format_check" decides whether we would continue
2426
2426
  context.registerVariable(new sys_var_constrained_value<uint32_t>("purge_threads",
2427
2427
                                                                   innodb_n_purge_threads,
2428
2428
                                                                   purge_threads_update));
2429
 
  context.registerVariable(new sys_var_constrained_value<uint16_t>("fast_shutdown", innobase_fast_shutdown));
 
2429
  context.registerVariable(new sys_var_constrained_value<uint32_t>("fast_shutdown", innobase_fast_shutdown));
2430
2430
  context.registerVariable(new sys_var_std_string("file_format",
2431
2431
                                                  innobase_file_format_name,
2432
2432
                                                  innodb_file_format_name_validate));
2438
2438
                                                  innodb_file_format_max_validate));
2439
2439
  context.registerVariable(new sys_var_constrained_value_readonly<size_t>("buffer_pool_size", innobase_buffer_pool_size));
2440
2440
  context.registerVariable(new sys_var_constrained_value_readonly<int64_t>("log_file_size", innobase_log_file_size));
2441
 
  context.registerVariable(new sys_var_constrained_value_readonly<uint16_t>("flush_log_at_trx_commit",
 
2441
  context.registerVariable(new sys_var_constrained_value_readonly<uint32_t>("flush_log_at_trx_commit",
2442
2442
                                                  innodb_flush_log_at_trx_commit));
2443
2443
  context.registerVariable(new sys_var_constrained_value_readonly<unsigned int>("max_dirty_pages_pct",
2444
2444
                                                  innodb_max_dirty_pages_pct));
9299
9299
          po::value<additional_mem_pool_constraint>(&innobase_additional_mem_pool_size)->default_value(8*1024*1024L),
9300
9300
          "Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.");
9301
9301
  context("autoextend-increment",
9302
 
          po::value<autoextend_constraint>(&innodb_auto_extend_increment)->default_value(8L),
 
9302
          po::value<autoextend_constraint>(&innodb_auto_extend_increment)->default_value(64L),
9303
9303
          "Data file autoextend increment in megabytes");
9304
9304
  context("buffer-pool-size",
9305
9305
          po::value<buffer_pool_constraint>(&innobase_buffer_pool_size)->default_value(128*1024*1024L),