diff options
| author | unknown <ingo@mysql.com> | 2005-03-02 10:56:13 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-03-02 10:56:13 +0100 |
| commit | cc4455631a51c999324759391f6f843cf97fd923 (patch) | |
| tree | 04e597e0f2cb62e0de40965ce2cecaf4f015f6ab /innobase/srv | |
| parent | c4409a7cbf9b43ed450340ba9dd6a33f821df5f2 (diff) | |
| parent | 26f75ffc83e39ee915e8d4973955c950ddabb35b (diff) | |
| download | mariadb-git-cc4455631a51c999324759391f6f843cf97fd923.tar.gz | |
Merge
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
mysql-test/r/myisam.result:
SCCS merged
mysql-test/t/myisam.test:
SCCS merged
sql/ha_innodb.h:
SCCS merged
Diffstat (limited to 'innobase/srv')
| -rw-r--r-- | innobase/srv/srv0srv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 39bb5094053..538fd6ffc08 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -97,7 +97,7 @@ ulint srv_last_file_size_max = 0; /* if != 0, this tells the max size auto-extending may increase the last data file size */ -ulint srv_auto_extend_increment = 8; /* If the last data file is +ulong srv_auto_extend_increment = 8; /* If the last data file is auto-extended, we add this many pages to it at a time */ ulint* srv_data_file_is_raw_partition = NULL; @@ -323,9 +323,6 @@ disable adaptive hash indexes */ ibool srv_use_awe = FALSE; ibool srv_use_adaptive_hash_indexes = TRUE; -/* Maximum allowable purge history length. <=0 means 'infinite'. */ -ulint srv_max_purge_lag = 0; - /*-------------------------------------------*/ ulint srv_n_spin_wait_rounds = 20; ulint srv_n_free_tickets_to_enter = 500; @@ -972,6 +969,8 @@ srv_general_init(void) /*======================= InnoDB Server FIFO queue =======================*/ +/* Maximum allowable purge history length. <=0 means 'infinite'. */ +ulong srv_max_purge_lag = 0; /************************************************************************* Puts an OS thread to wait if there are too many concurrent threads |