mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
commit
216c3a3b5f
1 changed files with 6 additions and 4 deletions
|
@ -117,10 +117,12 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
|
|||
#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;
|
||||
|
||||
lock.l_type= (short) locktype;
|
||||
lock.l_whence= SEEK_SET;
|
||||
lock.l_start= (off_t) start;
|
||||
lock.l_len= (off_t) length;
|
||||
|
||||
if (MyFlags & MY_DONT_WAIT)
|
||||
{
|
||||
if (fcntl(fd,F_SETLK,&lock) != -1) /* Check if we can lock */
|
||||
|
|
Loading…
Reference in a new issue