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.26

Browse Source
This commit is contained in:
Sergei Golubchik
2015-08-03 13:05:40 +02:00
parent 3c3724991e
commit 167c540048
115 changed files with 496 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/perfschema/pfs_setup_object.cc
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2010, 2015, 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
@@ -55,8 +55,8 @@ int init_setup_object(const PFS_global_param *param)
if (setup_object_max > 0)
{
setup_object_array= PFS_MALLOC_ARRAY(setup_object_max, PFS_setup_object,
MYF(MY_ZEROFILL));
setup_object_array= PFS_MALLOC_ARRAY(setup_object_max, sizeof(PFS_setup_object),
PFS_setup_object, MYF(MY_ZEROFILL));
if (unlikely(setup_object_array == NULL))
return 1;
}