summaryrefslogtreecommitdiff
path: root/sql/ha_myisam.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-08-31 20:42:41 +0000
committerunknown <serg@serg.mysql.com>2002-08-31 20:42:41 +0000
commit3f363c7d4d04e9fda8fdf7b0ac99c369045e687c (patch)
treea02394af922b23a01c59b08ddac8cd6c519d08c3 /sql/ha_myisam.cc
parent85da4cfd71303d1022b334d243017fc5e8dd091b (diff)
downloadmariadb-git-3f363c7d4d04e9fda8fdf7b0ac99c369045e687c.tar.gz
LOCK+change+OPTIMIZE MyISAM bug
myisam/mi_delete_all.c: reverting the wrong bugfix mysql-test/r/delete.result: moving the test case to where it belongs mysql-test/t/delete.test: moving the test case to where it belongs
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r--sql/ha_myisam.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 6ff59babeb4..bae455cbb3c 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -566,11 +566,12 @@ int ha_myisam::repair(THD *thd, MI_CHECK &param, bool optimize)
}
if (!optimize ||
+ memcmp(file->state, & share->state.state, sizeof(MI_STATUS_INFO)) ||
((file->state->del || share->state.split != file->state->records) &&
(!(param.testflag & T_QUICK) ||
!(share->state.changed & STATE_NOT_OPTIMIZED_KEYS))))
{
- ulonglong key_map= ((local_testflag & T_CREATE_MISSING_KEYS) ?
+ ulonglong key_map= ((local_testflag & T_CREATE_MISSING_KEYS) ?
((ulonglong) 1L << share->base.keys)-1 :
share->state.key_map);
uint testflag=param.testflag;