diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-28 10:06:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-28 10:06:23 +0100 |
| commit | 3e2394a56b2c624fdd01723bf5c7f47fbbb853ec (patch) | |
| tree | 1e131bb25c7827a5b0eff98ade4cede7677073a9 /storage | |
| parent | 1bad8f9df39abe4f33d04e66a4935457512f567c (diff) | |
| parent | a9a0d0c3729ad3c6e295f68b6d4d5552b999a2e5 (diff) | |
| download | mariadb-git-3e2394a56b2c624fdd01723bf5c7f47fbbb853ec.tar.gz | |
Merge branch 'merge/merge-perfschema-5.6' into 10.0
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/perfschema/unittest/pfs-t.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/perfschema/unittest/pfs-t.cc b/storage/perfschema/unittest/pfs-t.cc index 209c4d1ca88..e6345f161b9 100644 --- a/storage/perfschema/unittest/pfs-t.cc +++ b/storage/perfschema/unittest/pfs-t.cc @@ -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 @@ -899,6 +899,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 */ @@ -1150,6 +1151,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); |