Commit f623ff35 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/41 

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/41


mysys/my_read.c:
  Manual merge
parents 9a506df0 ac1a030e

mysys/charset.c

+9 −6
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static my_bool my_read_charset_file(const char *filename, myf myflags) 
{

  char *buf;

  int  fd;

  uint len;

  uint len, tmp_len;

  MY_STAT stat_info;

  

  if (!my_stat(filename, &stat_info, MYF(myflags)) ||
@@ -321,12 +321,11 @@ static my_bool my_read_charset_file(const char *filename, myf myflags) 
    return TRUE;

  

  if ((fd=my_open(filename,O_RDONLY,myflags)) < 0)

  {

    my_free(buf,myflags);

    return TRUE;

  }

  len=read(fd,buf,len);

    goto error;

  tmp_len=my_read(fd, buf, len, myflags);

  my_close(fd,myflags);

  if (tmp_len != len)

    goto error;

  

  if (my_parse_charset_xml(buf,len,add_collation))

  {
@@ -340,6 +339,10 @@ static my_bool my_read_charset_file(const char *filename, myf myflags) 
  

  my_free(buf, myflags);  

  return FALSE;



error:

  my_free(buf, myflags);

  return TRUE;

}

mysys/my_lread.c

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ uint32 my_lread(int Filedes, byte *Buffer, uint32 Count, myf MyFlags) 
  DBUG_PRINT("my",("Fd: %d  Buffer: %ld  Count: %ld  MyFlags: %d",

		   Filedes, Buffer, Count, MyFlags));



  DBUG_PRINT("error", ("Deprecated my_lread() function should not be used."));



  /* Temp hack to get count to int32 while read wants int */

  if ((readbytes = (uint32) read(Filedes, Buffer, (uint) Count)) != Count)

  {

mysys/my_lwrite.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ uint32 my_lwrite(int Filedes, const byte *Buffer, uint32 Count, myf MyFlags) 
  DBUG_PRINT("my",("Fd: %d  Buffer: 0x%lx  Count: %ld  MyFlags: %d",

		   Filedes, Buffer, Count, MyFlags));



  DBUG_PRINT("error", ("Deprecated my_lwrite() function should not be used."));



  /* Temp hack to get count to int32 while write wants int */

  if ((writenbytes = (uint32) write(Filedes, Buffer, (uint) Count)) != Count)

  {

mysys/my_pread.c

+8 −4
Original line number Diff line number Diff line
@@ -52,8 +52,12 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset, 
      DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d",

			    readbytes,Count,Filedes,my_errno));

#ifdef THREAD

      if (readbytes == 0 && errno == EINTR)

      if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR)

      {

        DBUG_PRINT("debug", ("my_pread() was interrupted and returned %d",

                             (int) readbytes));

        continue;                              /* Interrupted */

      }

#endif

      if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))

      {
@@ -124,8 +128,8 @@ uint my_pwrite(int Filedes, const byte *Buffer, uint Count, my_off_t offset, 
      VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));

      continue;

    }

    if ((writenbytes == 0 && my_errno == EINTR) ||

	(writenbytes > 0 && (uint) writenbytes != (uint) -1))

    if ((writenbytes > 0 && (uint) writenbytes != (uint) -1) ||

        my_errno == EINTR)

      continue;					/* Retry */

#endif

    if (MyFlags & (MY_NABP | MY_FNABP))

mysys/my_quick.c

+25 −1
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ uint my_quick_read(File Filedes,byte *Buffer,uint Count,myf MyFlags) 


  if ((readbytes = (uint) read(Filedes, Buffer, Count)) != Count)

  {

#ifndef DBUG_OFF

    if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR)

    {  

      DBUG_PRINT("error", ("my_quick_read() was interrupted and returned %d"

                           ".  This function does not retry the read!",

                           (int) readbytes));

    }

#endif

    my_errno=errno;

    return readbytes;

  }
@@ -35,8 +43,24 @@ uint my_quick_read(File Filedes,byte *Buffer,uint Count,myf MyFlags) 


uint my_quick_write(File Filedes,const byte *Buffer,uint Count)

{

  if ((uint) write(Filedes,Buffer,Count) != Count)

#ifndef DBUG_OFF

  uint writtenbytes;

#endif



  if ((

#ifndef DBUG_OFF

       writtenbytes =

#endif

       (uint) write(Filedes,Buffer,Count)) != Count)

  {

#ifndef DBUG_OFF

    if ((writtenbytes == 0 || (int) writtenbytes == -1) && errno == EINTR)

    {  

      DBUG_PRINT("error", ("my_quick_write() was interrupted and returned %d"

                           ".  This function does not retry the write!",

                           (int) writtenbytes));

    }

#endif

    my_errno=errno;

    return (uint) -1;

  }