summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorsvoj@june.mysql.com <>2007-07-27 14:36:43 +0500
committersvoj@june.mysql.com <>2007-07-27 14:36:43 +0500
commit81905ee14fdfd83a33154103d854e9a773ae738c (patch)
tree0c10fccbc70886115686929027000f87ca323962 /myisam
parentc2080430c372c94ad0b939d7666135029102cd4b (diff)
parent9d1bfec265f66cb55cfcbb99595ba7b44bf1e00c (diff)
downloadmariadb-git-81905ee14fdfd83a33154103d854e9a773ae738c.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_extra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c
index 5eb5010ad8c..71e65153eac 100644
--- a/myisam/mi_extra.c
+++ b/myisam/mi_extra.c
@@ -278,7 +278,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
case HA_EXTRA_PREPARE_FOR_DELETE:
pthread_mutex_lock(&THR_LOCK_myisam);
share->last_version= 0L; /* Impossible version */
-#ifdef __WIN__
+#ifdef __WIN__REMOVE_OBSOLETE_WORKAROUND
/* Close the isam and data files as Win32 can't drop an open table */
pthread_mutex_lock(&share->intern_lock);
if (flush_key_blocks(share->key_cache, share->kfile,