summaryrefslogtreecommitdiff
path: root/sql/my_lock.c
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-11-28 04:47:47 +0200
committermonty@donna.mysql.com <>2000-11-28 04:47:47 +0200
commit74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03 (patch)
treee3d40dd7c6a7e86bd2388da19d59d5a372bf7bb8 /sql/my_lock.c
parentad2e43c7d6f4b7bbe5b92830ef11856c7d18b6b5 (diff)
downloadmariadb-git-74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03.tar.gz
New thr_alarm struct for better integration with OS2
Run bootstrap in separate thread Fix bug in FLUSH TABLES table_name
Diffstat (limited to 'sql/my_lock.c')
-rw-r--r--sql/my_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/my_lock.c b/sql/my_lock.c
index 6c35634203f..7025682d40e 100644
--- a/sql/my_lock.c
+++ b/sql/my_lock.c
@@ -54,7 +54,7 @@ int my_lock(File fd,int locktype,my_off_t start,my_off_t length,myf MyFlags)
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,&lock)) && !thr_got_alarm(&alarmed) &&
errno == EINTR) ;
thr_end_alarm(&alarmed);
if (value != -1)