summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 19:15:57 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 19:15:57 +0300
commitf177f125d4bfa8817833960286a5f18efe2fef1f (patch)
tree12c6aa853460beb2ff9510d0547c55586dccfa83 /strings
parent3e8cab51cb78f3e60e139af944eef8f25502fc81 (diff)
parent15f1e03d46dfa704beeed4880ed72c0163869dc3 (diff)
downloadmariadb-git-f177f125d4bfa8817833960286a5f18efe2fef1f.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'strings')
-rw-r--r--strings/strings_def.h2
-rw-r--r--strings/strmov_overlapp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/strings/strings_def.h b/strings/strings_def.h
index 80397d510d2..e137c796045 100644
--- a/strings/strings_def.h
+++ b/strings/strings_def.h
@@ -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 Street, Fifth Floor, Boston, MA 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file is to be include first in all files in the string directory */
diff --git a/strings/strmov_overlapp.c b/strings/strmov_overlapp.c
index 2a162c39903..fd1c5360871 100644
--- a/strings/strmov_overlapp.c
+++ b/strings/strmov_overlapp.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 Street, Fifth Floor, Boston, MA 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "strings_def.h"