summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-14 13:55:28 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-14 13:55:28 +0200
commitae29ea2d86cd3fe5b2016baf595744cfb44c52cd (patch)
tree6f5017d7d25380d567084842e35015f52724e8d1 /sql/slave.h
parent1b50d599606244677215fbe7b05be1a891fecf18 (diff)
parentef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (diff)
downloadmariadb-git-ae29ea2d86cd3fe5b2016baf595744cfb44c52cd.tar.gz
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.h b/sql/slave.h
index c220f881619..ae70f0194fa 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -1,5 +1,5 @@
-/*
- Copyright (c) 2000, 2010, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
+ Copyright (c) 2009, 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