diff options
author | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
commit | 16f98d684b766127312cd1f89b7b252e2d3ea2a2 (patch) | |
tree | d9b411a738093cebf4896002805fdc91ca117fb1 /innobase/srv/srv0srv.c | |
parent | b1789bea9c1c05083b887f98941be71076bb8c6d (diff) | |
parent | 89dce2fb8c299e6a99c953e9a650ec7bd4409bcb (diff) | |
download | mariadb-git-16f98d684b766127312cd1f89b7b252e2d3ea2a2.tar.gz |
Merge with 4.0
BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
Auto merged
innobase/include/trx0sys.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0rseg.c:
Auto merged
mysql-test/r/innodb-lock.result:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
Use local version during merge
Diffstat (limited to 'innobase/srv/srv0srv.c')
-rw-r--r-- | innobase/srv/srv0srv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index b8d03cfab5f..582f43fa4ec 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -881,6 +881,8 @@ srv_general_init(void) /*======================= InnoDB Server FIFO queue =======================*/ +/* Maximum allowable purge history length. <=0 means 'infinite'. */ +ulint srv_max_purge_lag = 0; /************************************************************************* Puts an OS thread to wait if there are too many concurrent threads |