diff options
author | tulin@dl145b.mysql.com <> | 2005-06-21 08:49:21 +0200 |
---|---|---|
committer | tulin@dl145b.mysql.com <> | 2005-06-21 08:49:21 +0200 |
commit | a6d0581275d208ad9417f37829814ce6cb609228 (patch) | |
tree | 021f00d0d8d4e312b7cc20166e879b5052187631 /sql/ha_innodb.h | |
parent | 566e9ec32a70ed6b6cd3edd48e659dc2e19f5c9d (diff) | |
parent | 8934dfaa7bb6b0827c1205c9acd2de544c201663 (diff) | |
download | mariadb-git-a6d0581275d208ad9417f37829814ce6cb609228.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
Diffstat (limited to 'sql/ha_innodb.h')
-rw-r--r-- | sql/ha_innodb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index f18d527e6b3..98496e748b4 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -228,7 +228,7 @@ extern long innobase_log_file_size, innobase_log_buffer_size; extern long innobase_buffer_pool_size, 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, innobase_thread_concurrency; +extern long innobase_force_recovery; extern long innobase_open_files; extern char *innobase_data_home_dir, *innobase_data_file_path; extern char *innobase_log_group_home_dir, *innobase_log_arch_dir; |