List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:July 6 2010 2:38am
Subject:bzr commit into mysql-trunk-bugfixing branch (davi:3094) WL#5486
View as plain text  
# At a local mysql-trunk-bugfixing repository of davi

 3094 Davi Arnaut	2010-07-05
      WL#5486: Remove code for unsupported platforms
      
      Remove Zortech specific code.

    removed:
      mysys/mf_util.c
    modified:
      mysys/mf_tempfile.c
      mysys/my_copy.c
      mysys/my_redel.c
=== modified file 'mysys/mf_tempfile.c'
--- a/mysys/mf_tempfile.c	2010-07-06 02:35:02 +0000
+++ b/mysys/mf_tempfile.c	2010-07-06 02:38:35 +0000
@@ -100,15 +100,6 @@ File create_temp_file(char *to, const ch
     my_errno= tmp;
   }
 
-#elif defined(_ZTC__)
-  if (!dir)
-    dir=getenv("TMPDIR");
-  if ((res=tempnam((char*) dir,(char *) prefix)))
-  {
-    strmake(to,res,FN_REFLEN-1);
-    (*free)(res);
-    file=my_create(to, 0, mode | O_EXCL | O_NOFOLLOW, MyFlags);
-  }
 #elif defined(HAVE_MKSTEMP)
   {
     char prefix_buff[30];

=== removed file 'mysys/mf_util.c'
--- a/mysys/mf_util.c	2006-12-23 19:17:15 +0000
+++ b/mysys/mf_util.c	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/* Copyright (C) 2000 MySQL 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
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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 */
-
-/* Utilities with are missing on some systems */
-
-#include "mysys_priv.h"
-#ifdef __ZTC__
-#include <dos.h>
-#endif
-
-#ifdef __ZTC__
-
-	/* On ZORTECH C we don't have a getpid() call */
-
-int getpid(void)
-{
-  return (int) _psp;
-}
-
-#ifndef M_IC80386
-
-	/* Define halloc and hfree in as in MSC */
-
-void *	__CDECL halloc(long count,size_t length)
-{
-   return (void*) MK_FP(dos_alloc((uint) ((count*length+15) >> 4)),0);
-}
-
-void __CDECL hfree(void *ptr)
-{
-   dos_free(FP_SEG(ptr));
-}
-
-#endif /* M_IC80386 */
-#endif /* __ZTC__ */

=== modified file 'mysys/my_copy.c'
--- a/mysys/my_copy.c	2010-07-06 02:35:02 +0000
+++ b/mysys/my_copy.c	2010-07-06 02:38:35 +0000
@@ -106,7 +106,7 @@ int my_copy(const char *from, const char
 #if !defined(__WIN__)
     res= chown(to, stat_buff.st_uid,stat_buff.st_gid); /* Copy ownership */
 #endif
-#if !defined(VMS) && !defined(__ZTC__)
+#if !defined(VMS)
     if (MyFlags & MY_COPYTIME)
     {
       struct utimbuf timep;

=== modified file 'mysys/my_redel.c'
--- a/mysys/my_redel.c	2010-07-06 02:35:02 +0000
+++ b/mysys/my_redel.c	2010-07-06 02:38:35 +0000
@@ -101,7 +101,6 @@ int my_copystat(const char *from, const
 #endif /* !__WIN__ */
 
 #ifndef VMS
-#ifndef __ZTC__
   if (MyFlags & MY_COPYTIME)
   {
     struct utimbuf timep;
@@ -118,6 +117,5 @@ int my_copystat(const char *from, const
     (void) utime((char*) to, time);/* Update last accessed and modified times */
   }
 #endif
-#endif
   return 0;
 } /* my_copystat */


Attachment: [text/bzr-bundle] bzr/davi.arnaut@sun.com-20100706023835-17h30tmt0ha2gy15.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (davi:3094) WL#5486Davi Arnaut6 Jul
Re: bzr commit into mysql-trunk-bugfixing branch (davi:3094) WL#5486Jon Olav Hauglid13 Jul