diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
| commit | 9e8e328354fe30c5714e017ce8e1a9971af6e035 (patch) | |
| tree | 767c26a535c75a55034463ff090808d95891c741 /sql/ha_innodb.h | |
| parent | 8719538157a5e462cddacfffe3d91317339f2387 (diff) | |
| parent | 374850dc87688549fc686ac020b4d9b529466921 (diff) | |
| download | mariadb-git-9e8e328354fe30c5714e017ce8e1a9971af6e035.tar.gz | |
Merge hundin.mysql.fi:/home/marko/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
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 4c0f5209af9..90cae3998ed 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -218,7 +218,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; |