diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
| commit | cb67dcb6184535349ca4ff3d7c64eba9c63a0688 (patch) | |
| tree | 10d38ccf7fe60d5ea5c866d37292833b77dfcdae /storage/perfschema | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| parent | faec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff) | |
| download | mariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz | |
mysql-5.5.37 selective merge
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/ha_perfschema.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/ha_perfschema.h | 4 | ||||
| -rw-r--r-- | storage/perfschema/unittest/conf.txt | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index 0fb86cfe5cd..de45884621b 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/storage/perfschema/ha_perfschema.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2014, 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/ha_perfschema.h b/storage/perfschema/ha_perfschema.h index 17ab601e60f..5fb817ca0bf 100644 --- a/storage/perfschema/ha_perfschema.h +++ b/storage/perfschema/ha_perfschema.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2014, 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 @@ -17,6 +17,8 @@ #define HA_PERFSCHEMA_H #include "handler.h" /* class handler */ +#include "table.h" +#include "sql_class.h" #ifdef USE_PRAGMA_INTERFACE #pragma interface /* gcc class implementation */ diff --git a/storage/perfschema/unittest/conf.txt b/storage/perfschema/unittest/conf.txt index 6d262854330..e4ee3eb18f6 100644 --- a/storage/perfschema/unittest/conf.txt +++ b/storage/perfschema/unittest/conf.txt @@ -1,4 +1,5 @@ # Copyright (c) 2009, 2010 Sun Microsystems, Inc. +# Use is subject to license terms # # 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 |