← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mysql-5.6/utopic-proposed

« back to all changes in this revision

Viewing changes to storage/innobase/srv/srv0mon.cc

  • Committer: Package Import Robot
  • Author(s): James Page, Bjoern Boschman
  • Date: 2014-07-21 14:01:12 UTC
  • mfrom: (5.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20140721140112-1yqdrd6ds8y7nt76
Tags: 5.6.19-1~exp1
https://launchpad.net/bugs/1330168
[ Bjoern Boschman ]
* SECURITY UPDATE: New upstream release (LP: #1330168).
  - www.oracle.com/technetwork/topics/security/cpujul2014-1972956.html
  - CVE-2014-2484
  - CVE-2014-4258
  - CVE-2014-4260
  - CVE-2014-4238
  - CVE-2014-4233
  - CVE-2014-4240
  - CVE-2014-4214

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/srv/srv0mon.cc
41
41
/* Macro to standardize the counter names for counters in the
42
42
"monitor_buf_page" module as they have very structured defines */
43
43
#define MONITOR_BUF_PAGE(name, description, code, op, op_code)  \
44
 
        {"buffer_page_"op"_"name, "buffer_page_io",             \
45
 
         "Number of "description" Pages "op,                    \
 
44
        {"buffer_page_" op "_" name, "buffer_page_io",          \
 
45
         "Number of " description " Pages " op,                 \
46
46
         MONITOR_GROUP_MODULE, MONITOR_DEFAULT_START,           \
47
47
         MONITOR_##code##_##op_code}
48
48