← 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: 2010-12-02 20:07:39 UTC
  • mfrom: (1968.1.3 build)
  • Revision ID: kalebral@gmail.com-20101202200739-w4el9ey7b4m5laug
Merge Vijay - Merge refactor of bool type sys_vars to the new system
Merge Monty - fix bug 683842: remove generic catch blocks       
Merge Monty sys_var cleanup for haildb

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
2418
2418
 
2419
2419
  context.add(new(std::nothrow)InnodbInternalTables());
2420
2420
 
 
2421
  context.registerVariable(new sys_var_bool_ptr_readonly("checksums", &innobase_use_checksums));
 
2422
  context.registerVariable(new sys_var_bool_ptr_readonly("doublewrite", &innobase_use_doublewrite));
 
2423
  context.registerVariable(new sys_var_bool_ptr("file_per_table", &srv_file_per_table));
 
2424
  context.registerVariable(new sys_var_bool_ptr_readonly("file_format_check", &innobase_file_format_check));
 
2425
  context.registerVariable(new sys_var_bool_ptr("adaptive_flushing", &srv_adaptive_flushing));
 
2426
  context.registerVariable(new sys_var_bool_ptr("status_file", &innobase_create_status_file));
 
2427
  context.registerVariable(new sys_var_bool_ptr_readonly("use_sys_malloc", &srv_use_sys_malloc));
 
2428
  context.registerVariable(new sys_var_bool_ptr_readonly("use_native_aio", &srv_use_native_aio));
 
2429
 
 
2430
 
2421
2431
  /* Get the current high water mark format. */
2422
2432
  innobase_file_format_max = (char*) trx_sys_file_format_max_get();
2423
2433
 
9428
9438
}
9429
9439
 
9430
9440
/* plugin options */
9431
 
static DRIZZLE_SYSVAR_BOOL(checksums, innobase_use_checksums,
9432
 
  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
9433
 
  "Enable InnoDB checksums validation (enabled by default). ",
9434
 
  NULL, NULL, TRUE);
9435
9441
 
9436
9442
static DRIZZLE_SYSVAR_STR(data_home_dir, innobase_data_home_dir,
9437
9443
  PLUGIN_VAR_READONLY,
9438
9444
  "The common part for InnoDB table spaces.",
9439
9445
  NULL, NULL, NULL);
9440
9446
 
9441
 
static DRIZZLE_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
9442
 
  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
9443
 
  "Enable InnoDB doublewrite buffer (enabled by default). ",
9444
 
  NULL, NULL, TRUE);
9445
 
 
9446
9447
static DRIZZLE_SYSVAR_ULONG(io_capacity, srv_io_capacity,
9447
9448
  PLUGIN_VAR_RQCMDARG,
9448
9449
  "Number of IOPs the server can do. Tunes the background IO rate",
9473
9474
  ".",
9474
9475
  NULL, NULL, 1, 0, 2, 0);
9475
9476
 
9476
 
static DRIZZLE_SYSVAR_BOOL(file_per_table, srv_file_per_table,
9477
 
  PLUGIN_VAR_NOCMDARG,
9478
 
  "Stores each InnoDB table to an .ibd file in the database dir.",
9479
 
  NULL, NULL, TRUE);
9480
 
 
9481
9477
static DRIZZLE_SYSVAR_STR(file_format, innobase_file_format_name,
9482
9478
  PLUGIN_VAR_RQCMDARG,
9483
9479
  "File format to use for new tables in .ibd files.",
9490
9486
by the server. Can be set during server startup at command
9491
9487
line or configure file, and a read only variable after
9492
9488
server startup */
9493
 
static DRIZZLE_SYSVAR_BOOL(file_format_check, innobase_file_format_check,
9494
 
  PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
9495
 
  "Whether to perform system file format check.",
9496
 
  NULL, NULL, TRUE);
9497
9489
 
9498
9490
/* If a new file format is introduced, the file format
9499
9491
name needs to be updated accordingly. Please refer to
9522
9514
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
9523
9515
  "Where full logs should be archived.", NULL, NULL, NULL);
9524
9516
 
9525
 
static DRIZZLE_SYSVAR_BOOL(log_archive, innobase_log_archive,
9526
 
  PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
9527
 
  "Set to 1 if you want to have logs archived.", NULL, NULL, FALSE);
 
9517
 context.registerVariable(new sys_var_bool_ptr_readonly("log_archive", &innobase_log_archive);
9528
9518
#endif /* UNIV_LOG_ARCHIVE */
9529
9519
 
9530
9520
static DRIZZLE_SYSVAR_STR(log_group_home_dir, innobase_log_group_home_dir,
9536
9526
  "Percentage of dirty pages allowed in bufferpool.",
9537
9527
  NULL, NULL, 75, 0, 99, 0);
9538
9528
 
9539
 
static DRIZZLE_SYSVAR_BOOL(adaptive_flushing, srv_adaptive_flushing,
9540
 
  PLUGIN_VAR_NOCMDARG,
9541
 
  "Attempt flushing dirty pages to avoid IO bursts at checkpoints.",
9542
 
  NULL, NULL, TRUE);
9543
 
 
9544
9529
static DRIZZLE_SYSVAR_ULONG(max_purge_lag, srv_max_purge_lag,
9545
9530
  PLUGIN_VAR_RQCMDARG,
9546
9531
  "Desired maximum length of the purge queue (0 = no limit)",
9547
9532
  NULL, NULL, 0, 0, ~0L, 0);
9548
9533
 
9549
 
static DRIZZLE_SYSVAR_BOOL(status_file, innobase_create_status_file,
9550
 
  PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_NOSYSVAR,
9551
 
  "Enable SHOW INNODB STATUS output in the innodb_status.<pid> file",
9552
 
  NULL, NULL, FALSE);
9553
 
 
9554
9534
static DRIZZLE_SYSVAR_ULONGLONG(stats_sample_pages, srv_stats_sample_pages,
9555
9535
  PLUGIN_VAR_RQCMDARG,
9556
9536
  "The number of index pages to sample when calculating statistics (default 8)",
9678
9658
  PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
9679
9659
  "InnoDB version", NULL, NULL, INNODB_VERSION_STR);
9680
9660
 
9681
 
static DRIZZLE_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
9682
 
  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
9683
 
  "Use OS memory allocator instead of InnoDB's internal memory allocator",
9684
 
  NULL, NULL, TRUE);
9685
 
 
9686
 
static DRIZZLE_SYSVAR_BOOL(use_native_aio, srv_use_native_aio,
9687
 
  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
9688
 
  "Use native AIO if supported on this platform.",
9689
 
  NULL, NULL, TRUE);
9690
 
 
9691
9661
static DRIZZLE_SYSVAR_STR(change_buffering, innobase_change_buffering,
9692
9662
  PLUGIN_VAR_RQCMDARG,
9693
9663
  "Buffer changes to reduce random access: "
9859
9829
  DRIZZLE_SYSVAR(autoextend_increment),
9860
9830
  DRIZZLE_SYSVAR(buffer_pool_size),
9861
9831
  DRIZZLE_SYSVAR(buffer_pool_instances),
9862
 
  DRIZZLE_SYSVAR(checksums),
9863
9832
  DRIZZLE_SYSVAR(commit_concurrency),
9864
9833
  DRIZZLE_SYSVAR(concurrency_tickets),
9865
9834
  DRIZZLE_SYSVAR(data_file_path),
9866
9835
  DRIZZLE_SYSVAR(data_home_dir),
9867
 
  DRIZZLE_SYSVAR(doublewrite),
9868
9836
  DRIZZLE_SYSVAR(fast_shutdown),
9869
9837
  DRIZZLE_SYSVAR(read_io_threads),
9870
9838
  DRIZZLE_SYSVAR(write_io_threads),
9871
 
  DRIZZLE_SYSVAR(file_per_table),
9872
9839
  DRIZZLE_SYSVAR(file_format),
9873
 
  DRIZZLE_SYSVAR(file_format_check),
9874
9840
  DRIZZLE_SYSVAR(file_format_max),
9875
9841
  DRIZZLE_SYSVAR(flush_log_at_trx_commit),
9876
9842
  DRIZZLE_SYSVAR(flush_method),
9886
9852
  DRIZZLE_SYSVAR(log_group_home_dir),
9887
9853
  DRIZZLE_SYSVAR(max_dirty_pages_pct),
9888
9854
  DRIZZLE_SYSVAR(max_purge_lag),
9889
 
  DRIZZLE_SYSVAR(adaptive_flushing),
9890
9855
  DRIZZLE_SYSVAR(mirrored_log_groups),
9891
9856
  DRIZZLE_SYSVAR(old_blocks_pct),
9892
9857
  DRIZZLE_SYSVAR(old_blocks_time),
9894
9859
  DRIZZLE_SYSVAR(stats_sample_pages),
9895
9860
  DRIZZLE_SYSVAR(adaptive_hash_index),
9896
9861
  DRIZZLE_SYSVAR(replication_delay),
9897
 
  DRIZZLE_SYSVAR(status_file),
9898
9862
  DRIZZLE_SYSVAR(strict_mode),
9899
9863
  DRIZZLE_SYSVAR(support_xa),
9900
9864
  DRIZZLE_SYSVAR(sync_spin_loops),
9903
9867
  DRIZZLE_SYSVAR(thread_concurrency),
9904
9868
  DRIZZLE_SYSVAR(thread_sleep_delay),
9905
9869
  DRIZZLE_SYSVAR(version),
9906
 
  DRIZZLE_SYSVAR(use_sys_malloc),
9907
 
  DRIZZLE_SYSVAR(use_native_aio),
9908
9870
  DRIZZLE_SYSVAR(change_buffering),
9909
9871
  DRIZZLE_SYSVAR(read_ahead_threshold),
9910
9872
  DRIZZLE_SYSVAR(io_capacity),