diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2019-05-11 22:19:05 +0300 |
commit | cb248f880619431850e5638009a6098048050edf (patch) | |
tree | 32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /libmysqld | |
parent | c0ac0b886047496e105a566a063bf1bd932d00a4 (diff) | |
parent | 5543b75550962f07b4adcd47a6e52accec0a7d0f (diff) | |
download | mariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz |
Merge branch '5.5' into 10.1
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/CMakeLists.txt | 2 | ||||
-rw-r--r-- | libmysqld/emb_qcache.cc | 2 | ||||
-rw-r--r-- | libmysqld/emb_qcache.h | 2 | ||||
-rw-r--r-- | libmysqld/embedded_priv.h | 2 | ||||
-rw-r--r-- | libmysqld/examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | libmysqld/examples/builder-sample/emb_sample.bpr | 2 | ||||
-rw-r--r-- | libmysqld/examples/builder-sample/emb_sample.cpp | 2 | ||||
-rw-r--r-- | libmysqld/examples/builder-sample/emb_samples.cpp | 2 | ||||
-rw-r--r-- | libmysqld/examples/builder-sample/emb_samples.h | 2 | ||||
-rwxr-xr-x | libmysqld/examples/test-run | 2 | ||||
-rw-r--r-- | libmysqld/libmysqld.c | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 4621670c28c..98410b805b5 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/emb_qcache.cc b/libmysqld/emb_qcache.cc index a1a66421db8..edb5ee91359 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/libmysqld.c b/libmysqld/libmysqld.c index 543ab86643e..8f3680a49d5 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> |