diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-28 11:57:52 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-28 11:57:52 +0100 |
commit | 880d54355432d6135a77c1cff3f15977947b3107 (patch) | |
tree | 01909a9746b303312049e8f59d3410e84e4747dd /include/mysql/psi/mysql_memory.h | |
parent | 430d60d1fc01958f2a503d01b24154672a4189bf (diff) | |
parent | 157e66273b83119fe4837693899b2b2ef84de02c (diff) | |
download | mariadb-git-880d54355432d6135a77c1cff3f15977947b3107.tar.gz |
Merge branch 'merge-perfschema-5.7' into 10.5
Diffstat (limited to 'include/mysql/psi/mysql_memory.h')
-rw-r--r-- | include/mysql/psi/mysql_memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql/psi/mysql_memory.h b/include/mysql/psi/mysql_memory.h index a79579c2e56..b461f2fb206 100644 --- a/include/mysql/psi/mysql_memory.h +++ b/include/mysql/psi/mysql_memory.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2012, 2021, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, |