mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
765940cb3a
Fixed that @VAR shows all decimals Fixed problem with FLUSH TABLES and LOCK TABLE CREATE ... SELECT now creates keys later Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key Docs/manual.texi: Added MySQL/PostgreSQL comparison isam/_dynrec.c: Fixed wrong compare (not used in MySQL) myisam/mi_dynrec.c: Fixed wrong compare (not used in MySQL). Changed compare to use my_pread() myisam/mi_packrec.c: cleanup mysql-test/r/alter_table.result: Added test for ALTER TABLE mysql-test/r/variables.result: Added test for variables with REAL values. mysql-test/t/alter_table.test: Added test for ALTER TABLE mysql-test/t/variables.test: Added test for variables with REAL values. mysys/my_pread.c: Cleanup sql-bench/Makefile.am: removed extra \ sql-bench/README: Fixed typo. sql/item_func.cc: Fixed that @VAR shows all decimals sql/share/swedish/errmsg.OLD: update sql/sql_base.cc: Fixed problem with FLUSH TABLES and LOCK TABLE sql/sql_insert.cc: CREATE ... SELECT now creates keys later sql/sql_table.cc: Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key. BitKeeper/etc/ignore: Added sql-bench/graph-compare-results to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
146 lines
4.6 KiB
C
146 lines
4.6 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <errno.h>
|
|
#ifdef HAVE_PREAD
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
/* Read a chunk of bytes from a file */
|
|
|
|
uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset,
|
|
myf MyFlags)
|
|
{
|
|
uint readbytes;
|
|
int error;
|
|
DBUG_ENTER("my_pread");
|
|
DBUG_PRINT("my",("Fd: %d Seek: %lu Buffer: %lx Count: %u MyFlags: %d",
|
|
Filedes, (ulong) offset, Buffer, Count, MyFlags));
|
|
|
|
for (;;)
|
|
{
|
|
#ifndef __WIN__
|
|
errno=0; /* Linux doesn't reset this */
|
|
#endif
|
|
#ifndef HAVE_PREAD
|
|
pthread_mutex_lock(&my_file_info[Filedes].mutex);
|
|
readbytes= (uint) -1;
|
|
error= (lseek(Filedes, offset, MY_SEEK_SET) == -1L ||
|
|
(readbytes = (uint) read(Filedes, Buffer, Count)) != Count);
|
|
pthread_mutex_unlock(&my_file_info[Filedes].mutex);
|
|
#else
|
|
error=((readbytes = (uint) pread(Filedes, Buffer, Count, offset)) != Count);
|
|
#endif
|
|
if (error)
|
|
{
|
|
my_errno=errno;
|
|
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)
|
|
continue; /* Interrupted */
|
|
#endif
|
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
|
{
|
|
if ((int) readbytes == -1)
|
|
my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
else if (MyFlags & (MY_NABP | MY_FNABP))
|
|
my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
}
|
|
if ((int) readbytes == -1 || (MyFlags & (MY_FNABP | MY_NABP)))
|
|
DBUG_RETURN(MY_FILE_ERROR); /* Return with error */
|
|
}
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
DBUG_RETURN(0); /* Read went ok; Return 0 */
|
|
DBUG_RETURN(readbytes); /* purecov: inspected */
|
|
}
|
|
} /* my_pread */
|
|
|
|
|
|
/* Write a chunk of bytes to a file */
|
|
|
|
uint my_pwrite(int Filedes, const byte *Buffer, uint Count, my_off_t offset,
|
|
myf MyFlags)
|
|
{
|
|
uint writenbytes,errors;
|
|
ulong written;
|
|
DBUG_ENTER("my_pwrite");
|
|
DBUG_PRINT("my",("Fd: %d Seek: %lu Buffer: %lx Count: %d MyFlags: %d",
|
|
Filedes, (ulong) offset,Buffer, Count, MyFlags));
|
|
errors=0; written=0L;
|
|
|
|
for (;;)
|
|
{
|
|
#ifndef HAVE_PREAD
|
|
int error;
|
|
writenbytes= (uint) -1;
|
|
pthread_mutex_lock(&my_file_info[Filedes].mutex);
|
|
error=(lseek(Filedes, offset, MY_SEEK_SET) != -1L &&
|
|
(writenbytes = (uint) write(Filedes, Buffer, Count)) == Count);
|
|
pthread_mutex_unlock(&my_file_info[Filedes].mutex);
|
|
if (error)
|
|
break;
|
|
#else
|
|
if ((writenbytes = (uint) pwrite(Filedes, Buffer, Count,offset)) == Count)
|
|
break;
|
|
#endif
|
|
if ((int) writenbytes != -1)
|
|
{ /* Safegueard */
|
|
written+=writenbytes;
|
|
Buffer+=writenbytes;
|
|
Count-=writenbytes;
|
|
offset+=writenbytes;
|
|
}
|
|
my_errno=errno;
|
|
DBUG_PRINT("error",("Write only %d bytes",writenbytes));
|
|
#ifndef NO_BACKGROUND
|
|
#ifdef THREAD
|
|
if (my_thread_var->abort)
|
|
MyFlags&= ~ MY_WAIT_IF_FULL; /* End if aborted by user */
|
|
#endif
|
|
if (my_errno == ENOSPC && (MyFlags & MY_WAIT_IF_FULL))
|
|
{
|
|
if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
|
|
my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
|
|
my_filename(Filedes));
|
|
VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
|
|
continue;
|
|
}
|
|
if ((writenbytes == 0 && my_errno == EINTR) ||
|
|
(writenbytes > 0 && (uint) writenbytes != (uint) -1))
|
|
continue; /* Retry */
|
|
#endif
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
{
|
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
|
{
|
|
my_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
}
|
|
DBUG_RETURN(MY_FILE_ERROR); /* Error on read */
|
|
}
|
|
else
|
|
break; /* Return bytes written */
|
|
}
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
DBUG_RETURN(0); /* Want only errors */
|
|
DBUG_RETURN(writenbytes+written); /* purecov: inspected */
|
|
} /* my_write */
|