database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-10-30 13:02:59 +01:00
parent 8772824ce7 f4b8b6b9a3
commit 44f6f44593
250 changed files with 16242 additions and 4270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/perfschema/unittest/pfs-t.cc
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
/* Copyright (c) 2008, 2018, 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
@@ -898,6 +898,7 @@ void test_init_disabled()
psi->create_file(file_key_A, "foo-instrumented", (File) 12);
file_A1= lookup_file_by_name("foo-instrumented");
ok(file_A1 != NULL, "file_A1 instrumented");
destroy_file(reinterpret_cast<PFS_thread*>(psi->get_thread()), file_A1);
/* broken key + enabled T-1: no instrumentation */
@@ -1149,6 +1150,8 @@ void test_locker_disabled()
psi->create_file(file_key_A, "foo", (File) 12);
file_A1= (PSI_file*) lookup_file_by_name("foo");
ok(file_A1 != NULL, "instrumented");
destroy_file(reinterpret_cast<PFS_thread*>(psi->get_thread()),
reinterpret_cast<PFS_file*>(file_A1));
socket_class_A->m_enabled= true;
socket_A1= psi->init_socket(socket_key_A, NULL, NULL, 0);