diff options
| author | monty@hundin.mysql.fi <> | 2002-02-11 13:48:59 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-02-11 13:48:59 +0200 |
| commit | 4abd402b87def3f292f77b4091493675d9a37589 (patch) | |
| tree | ada172b5dc5dccd546e301548aac618812e19814 /sql/my_lock.c | |
| parent | 28670e4757fd33f8dead2902154e486cfc67fd27 (diff) | |
| parent | 1efcc3e35ea8323f592b7b752f0822293650eeb1 (diff) | |
| download | mariadb-git-4abd402b87def3f292f77b4091493675d9a37589.tar.gz | |
merge with 3.23.48
Diffstat (limited to 'sql/my_lock.c')
| -rw-r--r-- | sql/my_lock.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sql/my_lock.c b/sql/my_lock.c index 9b4ac502e57..4d451fcff22 100644 --- a/sql/my_lock.c +++ b/sql/my_lock.c @@ -26,10 +26,6 @@ #include <thr_alarm.h> #include <errno.h> -#ifdef HAVE_FCNTL -static struct flock lock; /* Must be static for sun-sparc */ -#endif - /* Lock a part of a file */ int my_lock(File fd,int locktype,my_off_t start,my_off_t length,myf MyFlags) @@ -37,24 +33,25 @@ int my_lock(File fd,int locktype,my_off_t start,my_off_t length,myf MyFlags) thr_alarm_t alarmed; ALARM alarm_buff; uint wait_for_alarm; + struct flock m_lock; DBUG_ENTER("my_lock"); DBUG_PRINT("my",("Fd: %d Op: %d start: %ld Length: %ld MyFlags: %d", fd,locktype,(ulong) start,(ulong) length,MyFlags)); if (my_disable_locking) DBUG_RETURN(0); /* purecov: inspected */ - lock.l_type=(short) locktype; - lock.l_whence=0L; - lock.l_start=(long) start; - lock.l_len=(long) length; + m_lock.l_type=(short) locktype; + m_lock.l_whence=0L; + m_lock.l_start=(long) start; + m_lock.l_len=(long) length; wait_for_alarm=(MyFlags & MY_DONT_WAIT ? MY_HOW_OFTEN_TO_ALARM : (uint) 12*60*60); - if (fcntl(fd,F_SETLK,&lock) != -1) /* Check if we can lock */ + if (fcntl(fd,F_SETLK,&m_lock) != -1) /* Check if we can lock */ DBUG_RETURN(0); /* Ok, file locked */ DBUG_PRINT("info",("Was locked, trying with alarm")); if (!thr_alarm(&alarmed,wait_for_alarm,&alarm_buff)) { int value; - while ((value=fcntl(fd,F_SETLKW,&lock)) && !thr_got_alarm(&alarmed) && + while ((value=fcntl(fd,F_SETLKW,&m_lock)) && !thr_got_alarm(&alarmed) && errno == EINTR) ; thr_end_alarm(&alarmed); if (value != -1) |