diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
| commit | be85d3e61bb4217453a6879cb28d9bd369ad17dd (patch) | |
| tree | c1ec0aab43cf0df71d88b8278367a79aabc43f52 /storage/federated | |
| parent | c0bc9480e73242b075178cb5da5713ba9d84be7c (diff) | |
| parent | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff) | |
| download | mariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/federated/ha_federated.cc | 2 | ||||
| -rw-r--r-- | storage/federated/ha_federated.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt index 057a5f28bb7..9d5c49c6a9c 100644 --- a/storage/federated/CMakeLists.txt +++ b/storage/federated/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(FEDERATED_SOURCES ha_federated.cc) MYSQL_ADD_PLUGIN(federated ${FEDERATED_SOURCES} STORAGE_ENGINE MODULE_ONLY) diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 4aed06885e5..79e70ce5123 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -12,7 +12,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 */ /* diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h index 8fe42bd2b08..0b34d66baa9 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.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 St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* Please read ha_exmple.cc before reading this file. |