diff options
author | Kristofer.Pettersson@naruto. <> | 2006-09-12 14:34:01 +0200 |
---|---|---|
committer | Kristofer.Pettersson@naruto. <> | 2006-09-12 14:34:01 +0200 |
commit | 53bb0bdcdab47bb7e54255cff87e3972e6303dd3 (patch) | |
tree | 7d026cf17ea3a71e9f2004965ce050c726dc0a00 /storage/myisam/mi_locking.c | |
parent | 9b18cae31bc9c56fc3852e8f61d34b83a6583e7d (diff) | |
parent | 323efcc0c185e69b1dc35fa6f637aae5905d8080 (diff) | |
download | mariadb-git-53bb0bdcdab47bb7e54255cff87e3972e6303dd3.tar.gz |
Merge naruto.:C:/cpp/bug20789/my50-bug20789
into naruto.:C:/cpp/mysql-5.1-maint
Diffstat (limited to 'storage/myisam/mi_locking.c')
-rw-r--r-- | storage/myisam/mi_locking.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c index ecb737867f5..18b87281f26 100644 --- a/storage/myisam/mi_locking.c +++ b/storage/myisam/mi_locking.c @@ -236,7 +236,18 @@ int mi_lock_database(MI_INFO *info, int lock_type) default: break; /* Impossible */ } + } +#ifdef __WIN__ + else + { + /* + The file has been closed and kfile is -1. + See mi_extra.c about implementation of + HA_EXTRA_PREPARE_FOR_DELETE. + */ + error=HA_ERR_NO_SUCH_TABLE; } +#endif pthread_mutex_unlock(&share->intern_lock); #if defined(FULL_LOG) || defined(_lint) lock_type|=(int) (flag << 8); /* Set bit to set if real lock */ |