summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-14 17:18:46 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-14 17:18:46 +0300
commitbe85d3e61bb4217453a6879cb28d9bd369ad17dd (patch)
treec1ec0aab43cf0df71d88b8278367a79aabc43f52 /sql-common
parentc0bc9480e73242b075178cb5da5713ba9d84be7c (diff)
parent26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff)
downloadmariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
-rw-r--r--sql-common/client_plugin.c2
-rw-r--r--sql-common/conf_to_src.c2
-rw-r--r--sql-common/errmsg.c2
-rw-r--r--sql-common/my_time.c2
-rw-r--r--sql-common/my_user.c2
-rw-r--r--sql-common/pack.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index d4ba7b6b9f5..e949b74b62c 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This file is included by both libmysql.c (the MySQL client C API)
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index 4c584d17294..b15203cd9be 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -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 */
/**
@file
diff --git a/sql-common/conf_to_src.c b/sql-common/conf_to_src.c
index 0e92388c93c..57d3ee864ac 100644
--- a/sql-common/conf_to_src.c
+++ b/sql-common/conf_to_src.c
@@ -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 */
/* can't use -lmysys because this prog is used to create -lstrings */
diff --git a/sql-common/errmsg.c b/sql-common/errmsg.c
index fc5a6a07e11..049fb51ec87 100644
--- a/sql-common/errmsg.c
+++ b/sql-common/errmsg.c
@@ -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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Error messages for MySQL clients */
/* (Error messages for the daemon are in share/language/errmsg.sys) */
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index c4731d6b601..36b6c368f56 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -13,7 +13,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_time.h>
diff --git a/sql-common/my_user.c b/sql-common/my_user.c
index 712101b471f..4af0f8f0796 100644
--- a/sql-common/my_user.c
+++ b/sql-common/my_user.c
@@ -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 <my_global.h>
#include <my_user.h>
diff --git a/sql-common/pack.c b/sql-common/pack.c
index da95172c92d..de821f08b35 100644
--- a/sql-common/pack.c
+++ b/sql-common/pack.c
@@ -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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_global.h>
#include <mysql_com.h>