diff options
| author | unknown <baker@bk-internal.mysql.com> | 2006-11-07 06:59:51 +0100 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2006-11-07 06:59:51 +0100 |
| commit | 9691a43cc805786a1c3a456c46df24908c4c7a52 (patch) | |
| tree | 8e65fc0884d7351a6b131804c5c7cc129d8e6cd9 /sql/set_var.cc | |
| parent | dd72647032cf157b063fe9a7f02ed2994734b1c0 (diff) | |
| parent | 53a95766b41d93cef9f00c089c8879edbc164308 (diff) | |
| download | mariadb-git-9691a43cc805786a1c3a456c46df24908c4c7a52.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 40e74be2cf0..5590e71c810 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -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}, |