summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2013-12-13 10:26:05 +0100
committerMarc Alff <marc.alff@oracle.com>2013-12-13 10:26:05 +0100
commit44e4929f341eff8bd2cbe4ea47a59c097e9f484c (patch)
tree19c2f2492553488c16c1b5725d126078191f7ba7
parent2dc95d5940b724167029edec9267d8e60e3a1b6d (diff)
parent82eed657a6b8812e688e93cfe25c1e6f71662fa1 (diff)
downloadmariadb-git-44e4929f341eff8bd2cbe4ea47a59c097e9f484c.tar.gz
Push to mysql-5.5
-rw-r--r--storage/perfschema/pfs_check.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/perfschema/pfs_check.cc b/storage/perfschema/pfs_check.cc
index c52be6f0da2..97b23c38065 100644
--- a/storage/perfschema/pfs_check.cc
+++ b/storage/perfschema/pfs_check.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2013, 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,6 +55,7 @@ void check_performance_schema()
PFS_engine_table_share::check_all_tables(thd);
+ thd->restore_globals();
delete thd;
DBUG_VOID_RETURN;
}