summaryrefslogtreecommitdiff
path: root/innobase/srv
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2005-03-01 09:51:32 +0200
committerunknown <marko@hundin.mysql.fi>2005-03-01 09:51:32 +0200
commitf2afed0d77ef606d4a8e3897ed5a581392ed9475 (patch)
tree08917af80bc31ecde2cf2efa63c7c2b751707442 /innobase/srv
parentd2ead18b69716bdd1e5610e666e26d1ae1d72197 (diff)
parent61ffbc31ae2172d3282288bc8c4520ea493c92ae (diff)
downloadmariadb-git-f2afed0d77ef606d4a8e3897ed5a581392ed9475.tar.gz
After merge fixes
Diffstat (limited to 'innobase/srv')
-rw-r--r--innobase/srv/srv0srv.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
index f61cc569f6b..0c888d7de72 100644
--- a/innobase/srv/srv0srv.c
+++ b/innobase/srv/srv0srv.c
@@ -96,7 +96,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;
@@ -266,9 +266,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_spin_wait_delay = 5;
@@ -881,6 +878,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