diff options
| author | guilhem@mysql.com <> | 2005-11-19 10:43:28 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2005-11-19 10:43:28 +0100 |
| commit | 24006266d08770ab72b5a7cde4813b9065be6ba8 (patch) | |
| tree | 50c76691f3d387a96de6c97132369326378c35ab /sql/ha_innodb.h | |
| parent | 7d7eb22ed1e471706cb9f27f9d55f469fc92fb4c (diff) | |
| parent | 86f1896fb0095e58e07afb3ee62a2e9394ab3579 (diff) | |
| download | mariadb-git-24006266d08770ab72b5a7cde4813b9065be6ba8.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-5.0-van
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index 32de25c78c6..c249cdf2bf4 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -218,8 +218,9 @@ extern ulong innobase_large_page_size; extern char *innobase_home, *innobase_tmpdir, *innobase_logdir; extern long innobase_lock_scan_time; extern long innobase_mirrored_log_groups, innobase_log_files_in_group; -extern long innobase_log_file_size, innobase_log_buffer_size; -extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size; +extern longlong innobase_buffer_pool_size, innobase_log_file_size; +extern long innobase_log_buffer_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; |