1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#16066243 PB2 FAILURES I_MAIN.BUG15912213 AND

Browse Source 
I_MAIN.CTYPE_UTF8 FOR MACOSX10.6 FOR 5.1

Part 2: Fix for test failures on Windows.
This commit is contained in:
Nirbhay Choubey 2013-01-07 16:16:08 +05:30
parent 1de6ac5b32
commit b53881c4de
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysys/mf_pack.c
View File

@ -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 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 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 You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software 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 "mysys_priv.h"
#include <m_string.h> #include <m_string.h>
@ -519,10 +520,10 @@ char *intern_filename(char *to, const char *from)
char buff[FN_REFLEN]; char buff[FN_REFLEN];
if (from == to) if (from == to)
{ /* Dirname may destroy from */ { /* Dirname may destroy from */
strmov(buff,from); (void) strnmov(buff, from, FN_REFLEN);
from=buff; from=buff;
} }
length= dirname_part(to, from, &to_length); /* Copy dirname & fix chars */ 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); return (to);
} /* intern_filename */ } /* intern_filename */

5
mysys/my_lib.c
View File

@ -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 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 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 You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software 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. */ /* TODO: check for overun of memory for names. */
/* Convert MSDOS-TIME to standar time_t (still needed?) */ /* Convert MSDOS-TIME to standar time_t (still needed?) */