diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 10:04:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 10:04:30 +0200 |
| commit | 04bce7b569f44f3aca3cb21953d41c2a4a02efe6 (patch) | |
| tree | 2530ccd90b42afa39b0a60f4454fd5ddb97c95e1 /storage/perfschema/pfs_global.cc | |
| parent | 7226287c066228a216217c43c48f3a0a833d9909 (diff) | |
| download | mariadb-git-04bce7b569f44f3aca3cb21953d41c2a4a02efe6.tar.gz | |
5.6.17
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 d0dc26b1bf4..a82ffe58cea 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 @@ -37,7 +37,7 @@ #endif bool pfs_initialized= false; -ulonglong pfs_allocated_memory= 0; +size_t pfs_allocated_memory= 0; /** Memory allocation for the performance schema. |