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 /plugin/file_key_management | |
| parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
| parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
| download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'plugin/file_key_management')
| -rw-r--r-- | plugin/file_key_management/file_key_management_plugin.cc | 2 | ||||
| -rw-r--r-- | plugin/file_key_management/parser.cc | 2 | ||||
| -rw-r--r-- | plugin/file_key_management/parser.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugin/file_key_management/file_key_management_plugin.cc b/plugin/file_key_management/file_key_management_plugin.cc index f6f7083d5f7..b5dcbd71f1e 100644 --- a/plugin/file_key_management/file_key_management_plugin.cc +++ b/plugin/file_key_management/file_key_management_plugin.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> #include <typelib.h> diff --git a/plugin/file_key_management/parser.cc b/plugin/file_key_management/parser.cc index ac78186a488..83895fe2808 100644 --- a/plugin/file_key_management/parser.cc +++ b/plugin/file_key_management/parser.cc @@ -12,7 +12,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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /******************************************************************//** @file Parser.cc diff --git a/plugin/file_key_management/parser.h b/plugin/file_key_management/parser.h index 627b7fd84a6..ca9dedd8acc 100644 --- a/plugin/file_key_management/parser.h +++ b/plugin/file_key_management/parser.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /******************************************************************//** @file Parser.h |