diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 12:13:09 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 12:13:09 +0300 |
| commit | 5064623ce4f721d7b3286296f7cd08e6eb8091b5 (patch) | |
| tree | df9ef00fba8b923c0b5555b4e5d7afaa75fe5109 /storage/perfschema | |
| parent | d8b45b0c004edc0b91029b232d7cc9aad02cc822 (diff) | |
| download | mariadb-git-5064623ce4f721d7b3286296f7cd08e6eb8091b5.tar.gz | |
Revert "Fix unit test after merge from mysql 5.5.35 perfschema"
This reverts commit 4799af092574e7957d7143c7751acef74a95a495.
Upstream provided adequate fix. This commit is no longer necessary.
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/unittest/pfs-t.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/perfschema/unittest/pfs-t.cc b/storage/perfschema/unittest/pfs-t.cc index 7883e8070fe..209c4d1ca88 100644 --- a/storage/perfschema/unittest/pfs-t.cc +++ b/storage/perfschema/unittest/pfs-t.cc @@ -1339,7 +1339,6 @@ void test_locker_disabled() /* Pretend the socket does not have a thread owner */ /* ---------------------------------------------- */ - psi->delete_current_thread(); socket_class_A->m_enabled= true; socket_A1= psi->init_socket(socket_key_A, NULL, NULL, 0); ok(socket_A1 != NULL, "instrumented"); |