diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 09:58:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 09:58:39 +0100 |
| commit | 08ba257846e75641304e530b7a4a4ab21b1714d7 (patch) | |
| tree | 5152c8e758f3b566dda4bf07bf5aad1607910eda /mysys/mf_pack.c | |
| parent | 65831bca6f516db383c1bc04884b65b9fa7b6926 (diff) | |
| parent | 40bbd1862376fa634e42b4e0197e22f5633f0c21 (diff) | |
| download | mariadb-git-08ba257846e75641304e530b7a4a4ab21b1714d7.tar.gz | |
mysql-5.1 merge
mysys/errors.c:
revert upstream's fix. use a much simpler one
mysys/my_write.c:
revert upstream's fix. use a simpler one
sql/item_xmlfunc.cc:
useless, but ok
sql/mysqld.cc:
simplify upstream's fix
storage/heap/hp_delete.c:
remove upstream's fix.
we'll use a much less expensive approach.
Diffstat (limited to 'mysys/mf_pack.c')
| -rw-r--r-- | mysys/mf_pack.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index e6b576b6d96..4521216cdc7 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2012, 2013, Monty Program Ab. 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 +12,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 +521,10 @@ char *intern_filename(char *to, const char *from) char buff[FN_REFLEN + 1]; 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 */ |