summaryrefslogtreecommitdiff
path: root/myisam/mi_locking.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-11-29 22:05:53 +0200
committerunknown <monty@hundin.mysql.fi>2001-11-29 22:05:53 +0200
commit38e439d819ded80625c528dc967b1344691b3926 (patch)
treeb28c969dcd0fed98efdee9cd0040842339cb35a4 /myisam/mi_locking.c
parent273177d83d52109e643d54cfda636da650569342 (diff)
parentc2689648cfe60d280c5a3da350f57527745deab3 (diff)
downloadmariadb-git-38e439d819ded80625c528dc967b1344691b3926.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi: Auto merged
Diffstat (limited to 'myisam/mi_locking.c')
-rw-r--r--myisam/mi_locking.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c
index b8ffc300fa9..68ef52ea819 100644
--- a/myisam/mi_locking.c
+++ b/myisam/mi_locking.c
@@ -305,10 +305,9 @@ int _mi_readinfo(register MI_INFO *info, int lock_type, int check_keybuffer)
MYISAM_SHARE *share=info->s;
if (!share->tot_locks)
{
- if ((info->tmp_lock_type=lock_type) != F_RDLCK)
- if (my_lock(share->kfile,lock_type,0L,F_TO_EOF,
- info->lock_wait | MY_SEEK_NOT_DONE))
- DBUG_RETURN(1);
+ if (my_lock(share->kfile,lock_type,0L,F_TO_EOF,
+ info->lock_wait | MY_SEEK_NOT_DONE))
+ DBUG_RETURN(1);
if (mi_state_info_read_dsk(share->kfile, &share->state, 1))
{
int error=my_errno ? my_errno : -1;