diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
| commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
| tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /wsrep | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| parent | cb248f880619431850e5638009a6098048050edf (diff) | |
| download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'wsrep')
| -rw-r--r-- | wsrep/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_api.h | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_dummy.c | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_gtid.c | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_loader.c | 2 | ||||
| -rw-r--r-- | wsrep/wsrep_uuid.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/wsrep/CMakeLists.txt b/wsrep/CMakeLists.txt index ff2bdec4def..061cb9f4a32 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 1d6bc059d3d..9d1280b6bc9 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 */ |