mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
31b9e6e03f
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
119 lines
3.4 KiB
C
119 lines
3.4 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>
|
|
#undef MY_HOW_OFTEN_TO_ALARM
|
|
#define MY_HOW_OFTEN_TO_ALARM ((int) my_time_to_wait_for_lock)
|
|
#ifdef NO_ALARM_LOOP
|
|
#undef NO_ALARM_LOOP
|
|
#endif
|
|
#include <my_alarm.h>
|
|
#ifdef __WIN__
|
|
#include <sys/locking.h>
|
|
#endif
|
|
#ifdef __EMX__
|
|
#define INCL_BASE
|
|
#define INCL_NOPMAPI
|
|
#include <os2emx.h>
|
|
#endif
|
|
|
|
/* Lock a part of a file */
|
|
|
|
int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
|
|
myf MyFlags)
|
|
{
|
|
#ifdef HAVE_FCNTL
|
|
int value;
|
|
ALARM_VARIABLES;
|
|
#endif
|
|
DBUG_ENTER("my_lock");
|
|
DBUG_PRINT("my",("Fd: %d Op: %d start: %ld Length: %ld MyFlags: %d",
|
|
fd,locktype,(long) start,(long) length,MyFlags));
|
|
#ifdef VMS
|
|
DBUG_RETURN(0);
|
|
#else
|
|
if (my_disable_locking)
|
|
DBUG_RETURN(0);
|
|
|
|
#if defined(__EMX__) || defined(OS2)
|
|
|
|
if (!_lock64( fd, locktype, start, length, MyFlags))
|
|
DBUG_RETURN(0);
|
|
|
|
#elif defined(HAVE_LOCKING)
|
|
/* Windows */
|
|
{
|
|
my_bool error;
|
|
pthread_mutex_lock(&my_file_info[fd].mutex);
|
|
if (MyFlags & MY_SEEK_NOT_DONE)
|
|
VOID(my_seek(fd,start,MY_SEEK_SET,MYF(MyFlags & ~MY_SEEK_NOT_DONE)));
|
|
error= locking(fd,locktype,(ulong) length) && errno != EINVAL;
|
|
pthread_mutex_unlock(&my_file_info[fd].mutex);
|
|
if (!error)
|
|
DBUG_RETURN(0);
|
|
}
|
|
#else
|
|
#if defined(HAVE_FCNTL)
|
|
{
|
|
struct flock lock;
|
|
lock.l_type= (short) locktype;
|
|
lock.l_whence=0L;
|
|
lock.l_start=(long) start;
|
|
lock.l_len=(long) length;
|
|
if (MyFlags & MY_DONT_WAIT)
|
|
{
|
|
if (fcntl(fd,F_SETLK,&lock) != -1) /* Check if we can lock */
|
|
DBUG_RETURN(0); /* Ok, file locked */
|
|
DBUG_PRINT("info",("Was locked, trying with alarm"));
|
|
ALARM_INIT;
|
|
while ((value=fcntl(fd,F_SETLKW,&lock)) && ! ALARM_TEST &&
|
|
errno == EINTR)
|
|
{ /* Setup again so we don`t miss it */
|
|
ALARM_REINIT;
|
|
}
|
|
ALARM_END;
|
|
if (value != -1)
|
|
DBUG_RETURN(0);
|
|
if (errno == EINTR)
|
|
errno=EAGAIN;
|
|
}
|
|
else if (fcntl(fd,F_SETLKW,&lock) != -1) /* Wait until a lock */
|
|
DBUG_RETURN(0);
|
|
}
|
|
#else
|
|
if (MyFlags & MY_SEEK_NOT_DONE)
|
|
VOID(my_seek(fd,start,MY_SEEK_SET,MYF(MyFlags & ~MY_SEEK_NOT_DONE)));
|
|
if (lockf(fd,locktype,length) != -1)
|
|
DBUG_RETURN(0);
|
|
#endif /* HAVE_FCNTL */
|
|
#endif /* HAVE_LOCKING */
|
|
|
|
/* We got an error. We don't want EACCES errors */
|
|
my_errno=(errno == EACCES) ? EAGAIN : errno ? errno : -1;
|
|
if (MyFlags & MY_WME)
|
|
{
|
|
if (locktype == F_UNLCK)
|
|
my_error(EE_CANTUNLOCK,MYF(ME_BELL+ME_WAITTANG),my_errno);
|
|
else
|
|
my_error(EE_CANTLOCK,MYF(ME_BELL+ME_WAITTANG),my_errno);
|
|
}
|
|
DBUG_PRINT("error",("my_errno: %d (%d)",my_errno,errno));
|
|
DBUG_RETURN(-1);
|
|
#endif /* ! VMS */
|
|
} /* my_lock */
|