diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
| commit | 0dc23679c867629ded5f9534d2ab6e8edf238aa0 (patch) | |
| tree | 9cf966507fa2ef0fd17932b600d051df5f7bd2e5 /storage/perfschema | |
| parent | 6efa5efa7dd112b6ac2efdd84235a13cca51c4d4 (diff) | |
| parent | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (diff) | |
| download | mariadb-git-0dc23679c867629ded5f9534d2ab6e8edf238aa0.tar.gz | |
10.0-base merge
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/pfs_check.cc | 3 | ||||
| -rw-r--r-- | storage/perfschema/pfs_events_waits.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/pfs_global.cc | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/storage/perfschema/pfs_check.cc b/storage/perfschema/pfs_check.cc index 2ab54ab1a4a..fb438f105ab 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->reset_globals(); delete thd; /* Remember that we don't have a THD */ set_current_thd(0); diff --git a/storage/perfschema/pfs_events_waits.cc b/storage/perfschema/pfs_events_waits.cc index c8a9d20a2f1..e823a0605e8 100644 --- a/storage/perfschema/pfs_events_waits.cc +++ b/storage/perfschema/pfs_events_waits.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 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 diff --git a/storage/perfschema/pfs_global.cc b/storage/perfschema/pfs_global.cc index 546597ef33e..0744bbab7d5 100644 --- a/storage/perfschema/pfs_global.cc +++ b/storage/perfschema/pfs_global.cc @@ -29,6 +29,10 @@ #include <unistd.h> #endif +#ifdef HAVE_STRING_H +#include <string.h> +#endif + #ifdef __WIN__ #include <winsock2.h> #else |