← 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: Brian Aker
  • Date: 2010-03-15 16:12:10 UTC
  • Revision ID: brian@gaz-20100315161210-mw2izyc425o5rt4j
Merge small removal of variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
219
219
#endif /* UNIV_LOG_ARCHIVE */
220
220
static my_bool  innobase_use_doublewrite                = TRUE;
221
221
static my_bool  innobase_use_checksums                  = TRUE;
222
 
static my_bool  innobase_locks_unsafe_for_binlog        = TRUE;
223
222
static my_bool  innobase_rollback_on_timeout            = FALSE;
224
223
static my_bool  innobase_create_status_file             = FALSE;
225
224
static my_bool  innobase_stats_on_metadata              = TRUE;
1925
1924
 
1926
1925
        row_rollback_on_timeout = (ibool) innobase_rollback_on_timeout;
1927
1926
 
1928
 
        srv_locks_unsafe_for_binlog = (ibool) innobase_locks_unsafe_for_binlog;
 
1927
        srv_locks_unsafe_for_binlog = (ibool) TRUE;
1929
1928
 
1930
1929
        srv_max_n_open_files = (ulint) innobase_open_files;
1931
1930
        srv_innodb_status = (ibool) innobase_create_status_file;
8584
8583
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
8585
8584
  "With which method to flush data.", NULL, NULL, NULL);
8586
8585
 
8587
 
static DRIZZLE_SYSVAR_BOOL(locks_unsafe_for_binlog, innobase_locks_unsafe_for_binlog,
8588
 
  PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
8589
 
  "Force InnoDB to not use next-key locking, to use only row-level locking.",
8590
 
  NULL, NULL, TRUE);
8591
 
 
8592
8586
#ifdef UNIV_LOG_ARCHIVE
8593
8587
static DRIZZLE_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
8594
8588
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
8799
8793
  DRIZZLE_SYSVAR(flush_log_at_trx_commit),
8800
8794
  DRIZZLE_SYSVAR(flush_method),
8801
8795
  DRIZZLE_SYSVAR(force_recovery),
8802
 
  DRIZZLE_SYSVAR(locks_unsafe_for_binlog),
8803
8796
  DRIZZLE_SYSVAR(lock_wait_timeout),
8804
8797
#ifdef UNIV_LOG_ARCHIVE
8805
8798
  DRIZZLE_SYSVAR(log_arch_dir),