diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
| commit | da4280fd58954a98608e61c503a91f47100e8f4f (patch) | |
| tree | dfc377a1dfbd4d2044a0b799ff5ed6411c7e864f /storage/perfschema/pfs_global.cc | |
| parent | d18cc84c73398eac5378d1dcd6b9c23fb6af32f6 (diff) | |
| parent | 55e5a785910059f955088113e95fe520ed86eb3f (diff) | |
| download | mariadb-git-da4280fd58954a98608e61c503a91f47100e8f4f.tar.gz | |
mysql-5.5.31 merge
Diffstat (limited to 'storage/perfschema/pfs_global.cc')
| -rw-r--r-- | storage/perfschema/pfs_global.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/perfschema/pfs_global.cc b/storage/perfschema/pfs_global.cc index fa57f335325..335f57c69c6 100644 --- a/storage/perfschema/pfs_global.cc +++ b/storage/perfschema/pfs_global.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 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 @@ -26,7 +26,7 @@ #include <string.h> bool pfs_initialized= false; -ulonglong pfs_allocated_memory= 0; +size_t pfs_allocated_memory= 0; /** Memory allocation for the performance schema. |