summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:47:26 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:54:04 +0300
commit26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch)
tree7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /libmysqld
parent8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff)
parentcb248f880619431850e5638009a6098048050edf (diff)
downloadmariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/CMakeLists.txt2
-rw-r--r--libmysqld/client_settings.h2
-rw-r--r--libmysqld/emb_qcache.cc2
-rw-r--r--libmysqld/emb_qcache.h2
-rw-r--r--libmysqld/embedded_priv.h2
-rw-r--r--libmysqld/examples/CMakeLists.txt2
-rw-r--r--libmysqld/examples/builder-sample/emb_sample.bpr2
-rw-r--r--libmysqld/examples/builder-sample/emb_sample.cpp2
-rw-r--r--libmysqld/examples/builder-sample/emb_samples.cpp2
-rw-r--r--libmysqld/examples/builder-sample/emb_samples.h2
-rwxr-xr-xlibmysqld/examples/test-run2
-rw-r--r--libmysqld/libmysql.c2
-rw-r--r--libmysqld/libmysqld.c2
13 files changed, 13 insertions, 13 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index a0fe5994cfd..2236d306318 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -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
ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY
${SSL_DEFINES})
diff --git a/libmysqld/client_settings.h b/libmysqld/client_settings.h
index 14be8b61f70..29f7c6c0d89 100644
--- a/libmysqld/client_settings.h
+++ b/libmysqld/client_settings.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 */
#ifndef CLIENT_SETTINGS_INCLUDED
#define CLIENT_SETTINGS_INCLUDED
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc
index 429b16b2dee..fead3a8b82b 100644
--- a/libmysqld/emb_qcache.cc
+++ b/libmysqld/emb_qcache.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 */
#include "my_global.h" // HAVE_*
#include "sql_priv.h"
diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h
index 8fd166df88d..fc60194d7f5 100644
--- a/libmysqld/emb_qcache.h
+++ b/libmysqld/emb_qcache.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 */
#include "sql_cache.h" /* Query_cache_block */
diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h
index c096954a460..77955ea499e 100644
--- a/libmysqld/embedded_priv.h
+++ b/libmysqld/embedded_priv.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 */
/* Prototypes for the embedded version of MySQL */
diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index 1eb07a2adf8..52fbe42aaa2 100644
--- a/libmysqld/examples/CMakeLists.txt
+++ b/libmysqld/examples/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
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/libmysqld/include
diff --git a/libmysqld/examples/builder-sample/emb_sample.bpr b/libmysqld/examples/builder-sample/emb_sample.bpr
index 100e5b98dfd..ab66dce8788 100644
--- a/libmysqld/examples/builder-sample/emb_sample.bpr
+++ b/libmysqld/examples/builder-sample/emb_sample.bpr
@@ -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
# ---------------------------------------------------------------------------
!if !$d(BCB)
diff --git a/libmysqld/examples/builder-sample/emb_sample.cpp b/libmysqld/examples/builder-sample/emb_sample.cpp
index 0c8f4fa0598..61b867c91e0 100644
--- a/libmysqld/examples/builder-sample/emb_sample.cpp
+++ b/libmysqld/examples/builder-sample/emb_sample.cpp
@@ -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
//---------------------------------------------------------------------------
#include <vcl.h>
diff --git a/libmysqld/examples/builder-sample/emb_samples.cpp b/libmysqld/examples/builder-sample/emb_samples.cpp
index aab1385f6e6..94787d587f1 100644
--- a/libmysqld/examples/builder-sample/emb_samples.cpp
+++ b/libmysqld/examples/builder-sample/emb_samples.cpp
@@ -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
//---------------------------------------------------------------------------
#include <vcl.h>
diff --git a/libmysqld/examples/builder-sample/emb_samples.h b/libmysqld/examples/builder-sample/emb_samples.h
index 3024e75d533..310f051af63 100644
--- a/libmysqld/examples/builder-sample/emb_samples.h
+++ b/libmysqld/examples/builder-sample/emb_samples.h
@@ -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
//---------------------------------------------------------------------------
#ifndef emb_samplesH
diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run
index 3b1cff2ddd8..7c221ad9b4f 100755
--- a/libmysqld/examples/test-run
+++ b/libmysqld/examples/test-run
@@ -14,7 +14,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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
# This is slapped together as a quick way to run the tests and
# is not meant for prime time. Please hack at it and submit
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index 767afed06b1..13f7f074d80 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -16,7 +16,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 */
#include <my_global.h>
#include <my_sys.h>
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index e5b6f6b8397..6de86927a38 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <mysql.h>