database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

5.6.17

Browse Source
This commit is contained in:
Sergei Golubchik
2014-05-07 10:04:30 +02:00
parent 7226287c06
commit 04bce7b569
208 changed files with 3026 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/perfschema/pfs_engine_table.cc
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2011, 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
@@ -723,7 +723,7 @@ bool pfs_show_status(handlerton *hton, THD *thd,
uint buflen;
const char *name;
int i;
uint size;
size_t size;
DBUG_ENTER("pfs_show_status");
@@ -737,7 +737,7 @@ bool pfs_show_status(handlerton *hton, THD *thd,
if (stat != HA_ENGINE_STATUS)
DBUG_RETURN(false);
uint total_memory= 0;
size_t total_memory= 0;
for (i=0; /* empty */; i++)
{
@@ -1431,7 +1431,7 @@ bool pfs_show_status(handlerton *hton, THD *thd,
break;
}
buflen= int10_to_str(size, buf, 10) - buf;
buflen= longlong10_to_str(size, buf, 10) - buf;
if (print(thd,
PERFORMANCE_SCHEMA_str.str, PERFORMANCE_SCHEMA_str.length,
name, strlen(name),