Commit 53a95766 authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 

into  zim.(none):/home/brian/mysql/merge-5.1


sql/mysqld.cc:
  Auto merged
parents 9beab523 48a1e6a3

sql/mysqld.cc

+0 −6
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ extern longlong innobase_log_file_size; 
extern long innobase_log_buffer_size;

extern longlong innobase_buffer_pool_size;

extern long innobase_additional_mem_pool_size;

extern long innobase_buffer_pool_awe_mem_mb;

extern long innobase_file_io_threads, innobase_lock_wait_timeout;

extern long innobase_force_recovery;

extern long innobase_open_files;
@@ -5774,10 +5773,6 @@ log and this option does nothing anymore.", 
   (gptr*) &srv_auto_extend_increment,

   (gptr*) &srv_auto_extend_increment,

   0, GET_LONG, REQUIRED_ARG, 8L, 1L, 1000L, 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,

   GET_LONG, REQUIRED_ARG, 0, 0, 63000, 0, 1, 0},

  {"innodb_buffer_pool_size", OPT_INNODB_BUFFER_POOL_SIZE,

   "The size of the memory buffer InnoDB uses to cache data and indexes of its tables.",

   (gptr*) &innobase_buffer_pool_size, (gptr*) &innobase_buffer_pool_size, 0,
@@ -8132,7 +8127,6 @@ longlong innobase_log_file_size; 
long innobase_log_buffer_size;

longlong innobase_buffer_pool_size;

long innobase_additional_mem_pool_size;

long innobase_buffer_pool_awe_mem_mb;

long innobase_file_io_threads, innobase_lock_wait_timeout;

long innobase_force_recovery;

long innobase_open_files;

sql/set_var.cc

+0 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ extern longlong innobase_log_file_size; 
extern long innobase_log_buffer_size;

extern longlong innobase_buffer_pool_size;

extern long innobase_additional_mem_pool_size;

extern long innobase_buffer_pool_awe_mem_mb;

extern long innobase_file_io_threads, innobase_lock_wait_timeout;

extern long innobase_force_recovery;

extern long innobase_open_files;
@@ -819,7 +818,6 @@ SHOW_VAR init_vars[]= { 
#ifdef WITH_INNOBASE_STORAGE_ENGINE

  {"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_LONGLONG },

  {"innodb_checksums", (char*) &innobase_use_checksums, SHOW_MY_BOOL},

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