diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_pack.c | 4 | ||||
| -rw-r--r-- | mysys/my_bitmap.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index 292cd8c0454..18c9a38f0db 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, 2011, 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 @@ -193,7 +193,7 @@ size_t cleanup_dirname(register char *to, const char *from) while (pos >= start && *pos != FN_LIBCHAR) /* remove prev dir */ pos--; if (pos[1] == FN_HOMELIB || - (pos > start && memcmp(pos, parent, length) == 0)) + (pos >= start && memcmp(pos, parent, length) == 0)) { /* Don't remove ~user/ */ pos=strmov(end_parentdir+1,parent); *pos=FN_LIBCHAR; diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index fbdc746dd70..47646feab79 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* + Copyright (c) 2001, 2011, 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 |