mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
bbab9ec678
Noteworthy: - New HANDLER code - New multi-update-grant-check code - Table lock code in ha_innodb.cc was not applied BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: Auto merged Build-tools/mysql-copyright-2: Auto merged acinclude.m4: Auto merged client/mysqladmin.c: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged ltmain.sh: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0row.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/ut/ut0dbg.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_close.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_locking.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/func_if.result: Auto merged Build-tools/mysql-copyright: Merge with 4.0 (too most of the code from 4.0) Makefile.am: merge client/mysql.cc: Used 4.1 code configure.in: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/ctype_latin1_de.result: merge mysql-test/r/flush_table.result: merge mysql-test/r/func_str.result: merge mysql-test/r/handler.result: merge mysql-test/r/multi_update.result: merge mysql-test/r/type_timestamp.result: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/r/update.result: merge mysql-test/t/delete.test: merge mysql-test/t/flush_table.test: merge mysql-test/t/func_str.test: merge mysql-test/t/handler.test: merge mysql-test/t/multi_update.test: merge mysql-test/t/type_timestamp.test: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/t/update.test: merge mysys/errors.c: merge mysys/my_fstream.c: merge mysys/my_pread.c: merge mysys/my_write.c: merge mysys/mysys_priv.h: merge scripts/mysqlhotcopy.sh: merge sql/field.cc: Keep code from 4.1 sql/field.h: Keep code from 4.1 sql/ha_innodb.cc: Don't merge lock code from 4.0; Heikki will look at this sql/ha_myisam.cc: merge sql/handler.cc: merge sql/item_cmpfunc.cc: merge sql/item_cmpfunc.h: merge sql/item_strfunc.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/protocol.cc: merge sql/records.cc: merge sql/repl_failsafe.cc: merge mysql-test/r/lock_multi.result: merge mysql-test/t/ctype_latin1_de.test: merge mysql-test/t/func_if.test: merge mysql-test/t/lock_multi.test: merge sql/repl_failsafe.h: merge Remove unnessessary header protection sql/slave.h: merge sql/sql_acl.cc: merge sql/sql_base.cc: merge sql/sql_cache.cc: auto merge sql/sql_class.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_handler.cc: Get new HANDLER code into 4.1 sql/sql_parse.cc: Keep old file sql/sql_repl.cc: merge sql/sql_repl.h: merge sql/sql_show.cc: merge sql/sql_table.cc: merge sql/sql_union.cc: Applied the examine_rows bug fix from 4.0 by hand sql/sql_update.cc: New multi-update-grant-check code from 4.0 sql/sql_yacc.yy: New multi-update-grant-check code from 4.0 sql/stacktrace.c: merge sql/table.h: merge
146 lines
4.6 KiB
C
146 lines
4.6 KiB
C
/* 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
#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: 0x%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: 0x%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 || my_errno == EDQUOT) &&
|
|
(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),my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
|
|
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_pwrite */
|