diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
| commit | c07325f932abef2032b2e56532f6cb615e2a1161 (patch) | |
| tree | 754ca158e45ebc014e5cbeaf4c3e7581f9575d76 /storage/federated | |
| parent | 7f8187bc432f79afe4c0549d68845a68e6c159ab (diff) | |
| parent | 2ae83affef5a4d89f38272db31a400f968279a7a (diff) | |
| download | mariadb-git-c07325f932abef2032b2e56532f6cb615e2a1161.tar.gz | |
Merge branch '10.3' into 10.4
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 45318f4c594..fc379707703 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. |