diff options
| author | unknown <ingo@mysql.com> | 2004-05-11 13:38:34 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2004-05-11 13:38:34 +0200 |
| commit | 1a5c4d25ad10225508861150455dd522266f0b96 (patch) | |
| tree | 222213f5bff6df0582c7515afc2d83fcdbafd898 | |
| parent | 5e96b1c52a92bffb0b5d00a4b0c2e08093d580e3 (diff) | |
| parent | 309e8337fc932546843ded9398211b368f507dbe (diff) | |
| download | mariadb-git-1a5c4d25ad10225508861150455dd522266f0b96.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
| -rw-r--r-- | mysys/my_lock.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysys/my_lock.c b/mysys/my_lock.c index 5058c301adb..8f915d6003a 100644 --- a/mysys/my_lock.c +++ b/mysys/my_lock.c @@ -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 */ |