summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergeyV@selena. <>2005-12-01 23:47:44 +0300
committerSergeyV@selena. <>2005-12-01 23:47:44 +0300
commit29941c07edf6136f44fa48e59d48ccc700a20dc9 (patch)
tree34b66e955da4607014009473483bac5e9b91291e /storage
parent27e962764d670e79734c19ca1200d1e861ed63cb (diff)
parent22b43351f823b08123b19aeee4c8f7bfa365bd22 (diff)
downloadmariadb-git-29941c07edf6136f44fa48e59d48ccc700a20dc9.tar.gz
Merge selena.:H:/MYSQL/bkt/mysql-5.0
into selena.:H:/MYSQL/bkt/mysql-5.1
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/mi_check.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 6296193d6b0..9ce1dff51af 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -402,7 +402,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
full_text_keys++;
if (share->state.key_root[key] == HA_OFFSET_ERROR &&
(info->state->records == 0 || keyinfo->flag & HA_FULLTEXT))
- continue;
+ goto do_stat;
if (!_mi_fetch_keypage(info,keyinfo,share->state.key_root[key],
DFLT_INIT_HITS,info->buff,0))
{
@@ -498,6 +498,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
param->max_level);
all_keydata+=param->keydata; all_totaldata+=param->totaldata; key_totlength+=length;
+do_stat:
if (param->testflag & T_STATISTICS)
update_key_parts(keyinfo, rec_per_key_part, param->unique_count,
param->stats_method == MI_STATS_METHOD_IGNORE_NULLS?