Commit 1dbc71af authored by unknown's avatar unknown
Browse files

Made innodb_autoextend_increment accessible as a global variable. 


sql/ha_innodb.cc:
  Removed variable innobase_auto_extend_increment
  (access srv_auto_extend_increment directly)
sql/ha_innodb.h:
  Removed variable innobase_auto_extend_increment
  (access srv_auto_extend_increment directly)
sql/mysqld.cc:
  Moved innodb_autoextend_increment to alphabetically correct position.
  Replaced innobase_auto_extend_increment with srv_auto_extend_increment.
sql/set_var.cc:
  Added innodb_autoextend_increment
parent 22cca358

sql/ha_innodb.cc

+1 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ long innobase_mirrored_log_groups, innobase_log_files_in_group, 
     innobase_buffer_pool_size, innobase_additional_mem_pool_size,

     innobase_file_io_threads, innobase_lock_wait_timeout,

     innobase_thread_concurrency, innobase_force_recovery,

     innobase_open_files, innobase_auto_extend_increment;

     innobase_open_files;



/* The default values for the following char* start-up parameters

are determined in innobase_init below: */
@@ -963,7 +963,6 @@ innobase_init(void) 
        srv_locks_unsafe_for_binlog = (ibool) innobase_locks_unsafe_for_binlog;



	srv_max_n_open_files = (ulint) innobase_open_files;

	srv_auto_extend_increment = (ulint) innobase_auto_extend_increment;

	srv_innodb_status = (ibool) innobase_create_status_file;



	srv_print_verbose_log = mysql_embedded ? 0 : 1;

sql/ha_innodb.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ extern long innobase_buffer_pool_awe_mem_mb; 
extern long innobase_file_io_threads, innobase_lock_wait_timeout;

extern long innobase_force_recovery, innobase_thread_concurrency;

extern long innobase_open_files;

extern long innobase_auto_extend_increment;

extern char *innobase_data_home_dir, *innobase_data_file_path;

extern char *innobase_log_group_home_dir, *innobase_log_arch_dir;

extern char *innobase_unix_file_flush_method;
@@ -194,6 +193,7 @@ extern my_bool innobase_log_archive, 
               innobase_create_status_file;

extern "C" {

extern ulong srv_max_buf_pool_modified_pct;

extern ulong srv_auto_extend_increment;

}



extern TYPELIB innobase_lock_typelib;

sql/mysqld.cc

+5 −5
Original line number Diff line number Diff line
@@ -4712,6 +4712,11 @@ replicating a LOAD DATA INFILE command.", 
   (gptr*) &innobase_additional_mem_pool_size,

   (gptr*) &innobase_additional_mem_pool_size, 0, GET_LONG, REQUIRED_ARG,

   1*1024*1024L, 512*1024L, ~0L, 0, 1024, 0},

  {"innodb_autoextend_increment", OPT_INNODB_AUTOEXTEND_INCREMENT,

   "Data file autoextend increment in megabytes",

   (gptr*) &srv_auto_extend_increment,

   (gptr*) &srv_auto_extend_increment,

   0, GET_LONG, REQUIRED_ARG, 8L, 1L, ~0L, 0, 1L, 0},

  {"innodb_buffer_pool_awe_mem_mb", OPT_INNODB_BUFFER_POOL_AWE_MEM_MB,

   "If Windows AWE is used, the size of InnoDB buffer pool allocated from the AWE memory.",

   (gptr*) &innobase_buffer_pool_awe_mem_mb, (gptr*) &innobase_buffer_pool_awe_mem_mb, 0,
@@ -4753,11 +4758,6 @@ replicating a LOAD DATA INFILE command.", 
   "How many files at the maximum InnoDB keeps open at the same time.",

   (gptr*) &innobase_open_files, (gptr*) &innobase_open_files, 0,

   GET_LONG, REQUIRED_ARG, 300L, 10L, ~0L, 0, 1L, 0},

  {"innodb_autoextend_increment", OPT_INNODB_AUTOEXTEND_INCREMENT,

   "Data file autoextend increment in megabytes",

   (gptr*) &innobase_auto_extend_increment,

   (gptr*) &innobase_auto_extend_increment,

   0, GET_LONG, REQUIRED_ARG, 8L, 1L, ~0L, 0, 1L, 0},

#ifdef HAVE_REPLICATION

  /*

    Disabled for the 4.1.3 release. Disabling just this paragraph of code is

sql/set_var.cc

+4 −0
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ sys_var_thd_ulong sys_net_wait_timeout("wait_timeout", 
#ifdef HAVE_INNOBASE_DB

sys_var_long_ptr        sys_innodb_max_dirty_pages_pct("innodb_max_dirty_pages_pct",

                                                        &srv_max_buf_pool_modified_pct);

sys_var_long_ptr	sys_innodb_autoextend_increment("innodb_autoextend_increment",

							&srv_auto_extend_increment);

#endif



/* Time/date/datetime formats */
@@ -601,6 +603,7 @@ sys_var *sys_variables[]= 
  &sys_os,

#ifdef HAVE_INNOBASE_DB

  &sys_innodb_max_dirty_pages_pct,

  &sys_innodb_autoextend_increment,

#endif    

  &sys_unique_checks,

  &sys_warning_count
@@ -674,6 +677,7 @@ struct show_var_st init_vars[]= { 
  {"init_slave",              (char*) &sys_init_slave,              SHOW_SYS},

#ifdef HAVE_INNOBASE_DB

  {"innodb_additional_mem_pool_size", (char*) &innobase_additional_mem_pool_size, SHOW_LONG },

  {sys_innodb_autoextend_increment.name, (char*) &sys_innodb_autoextend_increment, SHOW_SYS},

  {"innodb_buffer_pool_awe_mem_mb", (char*) &innobase_buffer_pool_awe_mem_mb, SHOW_LONG },

  {"innodb_buffer_pool_size", (char*) &innobase_buffer_pool_size, SHOW_LONG },

  {"innodb_data_file_path", (char*) &innobase_data_file_path,	    SHOW_CHAR_PTR},