diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /storage/xtradb/srv/srv0mon.cc | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'storage/xtradb/srv/srv0mon.cc')
| -rw-r--r-- | storage/xtradb/srv/srv0mon.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/srv/srv0mon.cc b/storage/xtradb/srv/srv0mon.cc index 57409243f5e..5e15dd15db2 100644 --- a/storage/xtradb/srv/srv0mon.cc +++ b/storage/xtradb/srv/srv0mon.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2010, 2014, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. Copyright (c) 2013, 2014, MariaDB Corporation @@ -1003,7 +1003,8 @@ static monitor_info_t innodb_counter_info[] = {"adaptive_hash_searches_btree", "adaptive_hash_index", "Number of searches using B-tree on an index search", - MONITOR_NONE, + static_cast<monitor_type_t>( + MONITOR_EXISTING | MONITOR_DEFAULT_ON), MONITOR_DEFAULT_START, MONITOR_OVLD_ADAPTIVE_HASH_SEARCH_BTREE}, {"adaptive_hash_pages_added", "adaptive_hash_index", |