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/blackhole | |
| parent | c0bc9480e73242b075178cb5da5713ba9d84be7c (diff) | |
| parent | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff) | |
| download | mariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/blackhole')
| -rw-r--r-- | storage/blackhole/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/blackhole/ha_blackhole.cc | 2 | ||||
| -rw-r--r-- | storage/blackhole/ha_blackhole.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt index bc14fdde0c1..c58ca1250de 100644 --- a/storage/blackhole/CMakeLists.txt +++ b/storage/blackhole/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(BLACKHOLE_SOURCES ha_blackhole.cc ha_blackhole.h) MYSQL_ADD_PLUGIN(blackhole ${BLACKHOLE_SOURCES} STORAGE_ENGINE) diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc index ed9b03dc82b..3180fe4bbfc 100644 --- a/storage/blackhole/ha_blackhole.cc +++ b/storage/blackhole/ha_blackhole.cc @@ -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 */ #ifdef USE_PRAGMA_IMPLEMENTATION diff --git a/storage/blackhole/ha_blackhole.h b/storage/blackhole/ha_blackhole.h index 9a4b34809f8..ea026c5837c 100644 --- a/storage/blackhole/ha_blackhole.h +++ b/storage/blackhole/ha_blackhole.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 */ #ifdef USE_PRAGMA_INTERFACE #pragma interface /* gcc class implementation */ |