summaryrefslogtreecommitdiff
path: root/wsrep
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 22:19:05 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 22:19:05 +0300
commitcb248f880619431850e5638009a6098048050edf (patch)
tree32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /wsrep
parentc0ac0b886047496e105a566a063bf1bd932d00a4 (diff)
parent5543b75550962f07b4adcd47a6e52accec0a7d0f (diff)
downloadmariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'wsrep')
-rw-r--r--wsrep/CMakeLists.txt2
-rw-r--r--wsrep/wsrep_api.h2
-rw-r--r--wsrep/wsrep_dummy.c2
-rw-r--r--wsrep/wsrep_gtid.c2
-rw-r--r--wsrep/wsrep_loader.c2
-rw-r--r--wsrep/wsrep_uuid.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/wsrep/CMakeLists.txt b/wsrep/CMakeLists.txt
index 53c8e853078..44078860f42 100644
--- a/wsrep/CMakeLists.txt
+++ b/wsrep/CMakeLists.txt
@@ -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
SET(WSREP_SOURCES wsrep_gtid.c wsrep_uuid.c wsrep_loader.c wsrep_dummy.c)
diff --git a/wsrep/wsrep_api.h b/wsrep/wsrep_api.h
index e713be094df..60abd9a69d1 100644
--- a/wsrep/wsrep_api.h
+++ b/wsrep/wsrep_api.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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
*/
/*!
diff --git a/wsrep/wsrep_dummy.c b/wsrep/wsrep_dummy.c
index e48dcff39a1..bd9f654b86b 100644
--- a/wsrep/wsrep_dummy.c
+++ b/wsrep/wsrep_dummy.c
@@ -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 Street, Fifth Floor, Boston, MA 02111-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*! @file Dummy wsrep API implementation. */
diff --git a/wsrep/wsrep_gtid.c b/wsrep/wsrep_gtid.c
index 45148785c25..bf5cab06585 100644
--- a/wsrep/wsrep_gtid.c
+++ b/wsrep/wsrep_gtid.c
@@ -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 Street, Fifth Floor, Boston, MA 02111-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*! @file Helper functions to deal with GTID string representations */
diff --git a/wsrep/wsrep_loader.c b/wsrep/wsrep_loader.c
index 1321538742f..d08632a94ce 100644
--- a/wsrep/wsrep_loader.c
+++ b/wsrep/wsrep_loader.c
@@ -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 Street, Fifth Floor, Boston, MA 02111-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*! @file wsrep implementation loader */
diff --git a/wsrep/wsrep_uuid.c b/wsrep/wsrep_uuid.c
index 54ae4ab5ed5..d525808d0da 100644
--- a/wsrep/wsrep_uuid.c
+++ b/wsrep/wsrep_uuid.c
@@ -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 Street, Fifth Floor, Boston, MA 02111-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*! @file Helper functions to deal with history UUID string representations */