diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 21:35:05 +0100 |
| commit | a5679af1b13bb0c7c4eaa75f27551072dc18fb7d (patch) | |
| tree | 7d039fb5e83c331daa75f9b9b67625b0469f6a9b /storage/xtradb/include/srv0mon.h | |
| parent | 20c4dfd4a9e7c5f2f570488a7ead0b7c74e61817 (diff) | |
| parent | 5f2f3c4fa81851b45dcee33601f14e05f6407333 (diff) | |
| download | mariadb-git-a5679af1b13bb0c7c4eaa75f27551072dc18fb7d.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/xtradb/include/srv0mon.h')
| -rw-r--r-- | storage/xtradb/include/srv0mon.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/storage/xtradb/include/srv0mon.h b/storage/xtradb/include/srv0mon.h index 658cd94d1ec..33ae7749ca5 100644 --- a/storage/xtradb/include/srv0mon.h +++ b/storage/xtradb/include/srv0mon.h @@ -2,7 +2,7 @@ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2015, MariaDB Corporation. +Copyright (c) 2013, 2016, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -263,9 +263,6 @@ enum monitor_id_t { MONITOR_OVLD_OS_LOG_FSYNC, MONITOR_OVLD_OS_LOG_PENDING_FSYNC, MONITOR_OVLD_OS_LOG_PENDING_WRITES, - MONITOR_MERGE_BLOCKS_WRITTEN, - MONITOR_MERGE_BLOCKS_READ, - MONITOR_MERGE_BLOCKS_MERGED, /* Transaction related counters */ MONITOR_MODULE_TRX, |