diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
| commit | cb248f880619431850e5638009a6098048050edf (patch) | |
| tree | 32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /storage/perfschema/unittest | |
| parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
| parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
| download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'storage/perfschema/unittest')
| -rw-r--r-- | storage/perfschema/unittest/pfs_server_stubs.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/unittest/stub_pfs_defaults.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/perfschema/unittest/pfs_server_stubs.cc b/storage/perfschema/unittest/pfs_server_stubs.cc index 1093b6a859b..3c4b864d742 100644 --- a/storage/perfschema/unittest/pfs_server_stubs.cc +++ b/storage/perfschema/unittest/pfs_server_stubs.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /* Minimal code to be able to link a unit test. diff --git a/storage/perfschema/unittest/stub_pfs_defaults.h b/storage/perfschema/unittest/stub_pfs_defaults.h index f4fa24245d5..6b4ee3f0e15 100644 --- a/storage/perfschema/unittest/stub_pfs_defaults.h +++ b/storage/perfschema/unittest/stub_pfs_defaults.h @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> #include <pfs.h> |