diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-01-07 16:16:08 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2013-01-07 16:16:08 +0530 |
| commit | b53881c4de85e104eb73ff34befb9b0ebc9b0f44 (patch) | |
| tree | fb74b59c152a9935def5475f7e0ca29b55f7012a /mysys | |
| parent | 1de6ac5b3255dcca24735d615a38871420f83ffb (diff) | |
| download | mariadb-git-b53881c4de85e104eb73ff34befb9b0ebc9b0f44.tar.gz | |
Bug#16066243 PB2 FAILURES I_MAIN.BUG15912213 AND
I_MAIN.CTYPE_UTF8 FOR MACOSX10.6 FOR 5.1
Part 2: Fix for test failures on Windows.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_pack.c | 9 | ||||
| -rw-r--r-- | mysys/my_lib.c | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index 0f150fa063e..acfad8948d4 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +11,8 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ #include "mysys_priv.h" #include <m_string.h> @@ -519,10 +520,10 @@ char *intern_filename(char *to, const char *from) char buff[FN_REFLEN]; if (from == to) { /* Dirname may destroy from */ - strmov(buff,from); + (void) strnmov(buff, from, FN_REFLEN); from=buff; } length= dirname_part(to, from, &to_length); /* Copy dirname & fix chars */ - (void) strmov(to + to_length,from+length); + (void) strnmov(to + to_length, from + length, FN_REFLEN - to_length); return (to); } /* intern_filename */ diff --git a/mysys/my_lib.c b/mysys/my_lib.c index 41dc8f46f8e..8bd9a289176 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +11,8 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ /* TODO: check for overun of memory for names. */ /* Convert MSDOS-TIME to standar time_t (still needed?) */ |