diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
| commit | ae29ea2d86cd3fe5b2016baf595744cfb44c52cd (patch) | |
| tree | 6f5017d7d25380d567084842e35015f52724e8d1 /sql/sql_reload.cc | |
| parent | 1b50d599606244677215fbe7b05be1a891fecf18 (diff) | |
| parent | ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (diff) | |
| download | mariadb-git-ae29ea2d86cd3fe5b2016baf595744cfb44c52cd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index b9328addc6a..8cc9dbd45fb 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -1,4 +1,5 @@ -/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2016, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, MariaDB 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 |