diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
| commit | 362046d74a7da1a7063e5c483654eeae5c92494e (patch) | |
| tree | 9677f13f29c93b0c65083bc23680739efeb821b9 /sql/ha_innodb.h | |
| parent | aaad070402f687e5b4f82019d571ef28d0b39fbc (diff) | |
| parent | ea30886c640e1557e9be320e3ea6fcb0df259292 (diff) | |
| download | mariadb-git-362046d74a7da1a7063e5c483654eeae5c92494e.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
innobase/btr/btr0btr.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0row.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index aa6a17be8e2..d72f5a58fe4 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -183,7 +183,6 @@ 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_open_files; -extern long innobase_auto_extend_increment; extern char *innobase_data_home_dir, *innobase_data_file_path; extern char *innobase_log_group_home_dir, *innobase_log_arch_dir; extern char *innobase_unix_file_flush_method; @@ -194,6 +193,8 @@ extern my_bool innobase_log_archive, innobase_create_status_file; extern "C" { extern ulong srv_max_buf_pool_modified_pct; +extern ulong srv_auto_extend_increment; +extern ulong srv_max_purge_lag; } extern TYPELIB innobase_lock_typelib; |