diff options
| author | unknown <svoj@june.mysql.com> | 2007-07-27 14:44:31 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-07-27 14:44:31 +0500 |
| commit | 04727a4c0639b1e1a6ad8ad43593fb4f4e9f6c5e (patch) | |
| tree | 8e18f4166ce59784fbd184b29af158ac8fe1135a /storage | |
| parent | 3b45a47c4036f6b3ae2a06d3a8e866fcd8eb64d8 (diff) | |
| parent | a52fe60375a84cb556857088e3261ee68521c711 (diff) | |
| download | mariadb-git-04727a4c0639b1e1a6ad8ad43593fb4f4e9f6c5e.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.1-engines
storage/myisam/mi_extra.c:
Auto merged
mysql-test/r/alter_table.result:
Manual merge
mysql-test/t/alter_table.test:
Manual merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/mi_extra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c index 72c40741a22..30802a50513 100644 --- a/storage/myisam/mi_extra.c +++ b/storage/myisam/mi_extra.c @@ -258,7 +258,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, |