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

Merge 10.0 into 10.1

Browse Source 
Significantly reduce the amount of InnoDB, XtraDB and Mariabackup
code changes by defining pfs_os_file_t as something that is
transparently compatible with os_file_t.
This commit is contained in:
Marko Mäkelä
2017-05-19 13:59:43 +03:00
parent 13a350ac29 335c4ab790
commit 65e1399e64
255 changed files with 7227 additions and 4903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storage/perfschema/unittest/pfs_instr-t.cc
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2008, 2017, 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
@@ -23,10 +23,11 @@
#include <memory.h>
PFS_global_param param;
void test_no_instruments()
{
int rc;
PFS_global_param param;
memset(& param, 0xFF, sizeof(param));
param.m_enabled= true;
@@ -86,7 +87,6 @@ void test_no_instances()
PFS_file *file;
PFS_socket *socket;
PFS_table *table;
PFS_global_param param;
memset(& param, 0xFF, sizeof(param));
param.m_enabled= true;
@@ -227,7 +227,6 @@ void test_with_instances()
PFS_socket *socket_2;
PFS_table *table_1;
PFS_table *table_2;
PFS_global_param param;
memset(& param, 0xFF, sizeof(param));
param.m_enabled= true;
@@ -414,6 +413,6 @@ int main(int argc, char **argv)
MY_INIT(argv[0]);
do_all_tests();
my_end(0);
return exit_status();
return (exit_status());
}