diff options
| author | unknown <joreland@mysql.com> | 2004-05-12 12:52:06 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-05-12 12:52:06 +0200 |
| commit | de861db3e73b72a01eceed23095c4793f893d6c4 (patch) | |
| tree | 224974699ea2f227ff1cc7a97d9e506cbe230b94 | |
| parent | 6f860637c15535fec534f26cbc9025fc76eac0e4 (diff) | |
| parent | bc2c0c595376a0cd0f09bf182123e79e70ff0790 (diff) | |
| download | mariadb-git-de861db3e73b72a01eceed23095c4793f893d6c4.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
| -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 */ |