diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 20:04:58 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 20:04:58 +0400 |
| commit | 241c1977dd1d0614c4d6400fa981e7f7facbd153 (patch) | |
| tree | 86e5f9ce0d8918d98f3fde0a8bf6939815c7af65 /storage/xtradb/srv | |
| parent | 29f0dcb56337a3e352ad7a70dcff6b25bb605325 (diff) | |
| parent | 56bca79f6a2ca554fb59a208e2b160dcb905113d (diff) | |
| download | mariadb-git-241c1977dd1d0614c4d6400fa981e7f7facbd153.tar.gz | |
Merge xtradb-7 -> MariaDB
Diffstat (limited to 'storage/xtradb/srv')
| -rw-r--r-- | storage/xtradb/srv/srv0srv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index 5afa5435b00..587f8319ad0 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -133,6 +133,8 @@ UNIV_INTERN ulint* srv_data_file_sizes = NULL; UNIV_INTERN ibool srv_extra_undoslots = FALSE; +UNIV_INTERN ibool srv_fast_recovery = FALSE; + /* if TRUE, then we auto-extend the last data file */ UNIV_INTERN ibool srv_auto_extend_last_data_file = FALSE; /* if != 0, this tells the max size auto-extending may increase the @@ -287,7 +289,6 @@ concurrency check. */ UNIV_INTERN ibool srv_thread_concurrency_timer_based = FALSE; UNIV_INTERN ulong srv_thread_concurrency = 0; -UNIV_INTERN ulong srv_commit_concurrency = 0; /* this mutex protects srv_conc data structures */ UNIV_INTERN os_fast_mutex_t srv_conc_mutex; |