summaryrefslogtreecommitdiff
path: root/extra/mariabackup/xtrabackup.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-14 17:18:46 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-14 17:18:46 +0300
commitbe85d3e61bb4217453a6879cb28d9bd369ad17dd (patch)
treec1ec0aab43cf0df71d88b8278367a79aabc43f52 /extra/mariabackup/xtrabackup.cc
parentc0bc9480e73242b075178cb5da5713ba9d84be7c (diff)
parent26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff)
downloadmariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'extra/mariabackup/xtrabackup.cc')
-rw-r--r--extra/mariabackup/xtrabackup.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 8aa1743d20b..ee0ec9af4b9 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -18,7 +18,7 @@ GNU General Public License for more details.
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
*******************************************************
@@ -36,8 +36,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
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
+this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1335 USA
*******************************************************/