diff options
| author | unknown <serg@serg.mylan> | 2003-08-26 23:57:14 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-08-26 23:57:14 +0200 |
| commit | b52da698f13d30182048c30faeeaae6775ec501f (patch) | |
| tree | e99eb0cdb27e8477e294b85b810ad3401ace9eda /myisam/mi_check.c | |
| parent | 70631cff85742bfd8e8deb4e174eb6e74f017800 (diff) | |
| parent | cc7b3c8269a761a848c26f2c6365a8cd5636f97a (diff) | |
| download | mariadb-git-b52da698f13d30182048c30faeeaae6775ec501f.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
myisam/mi_check.c:
Auto merged
Diffstat (limited to 'myisam/mi_check.c')
| -rw-r--r-- | myisam/mi_check.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 106e65e90d3..f5b0a1aabaa 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -36,7 +36,7 @@ /* Functions defined in this file */ static int check_k_link(MI_CHECK *param, MI_INFO *info,uint nr); -static int chk_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo, +static int chk_index(MI_CHECK *param, MI_INFO *info,MI_KEYDEF *keyinfo, my_off_t page, uchar *buff, ha_rows *keys, ha_checksum *key_checksum, uint level); static uint isam_key_length(MI_INFO *info,MI_KEYDEF *keyinfo); @@ -3686,6 +3686,9 @@ void update_key_parts(MI_KEYDEF *keyinfo, ulong *rec_per_key_part, tmp=records; else tmp= (records + (count+1)/2) / (count+1); + /* for some weird keys (e.g. FULLTEXT) tmp can be <1 here. + let's ensure it is not */ + set_if_bigger(tmp,1); if (tmp >= (ulonglong) ~(ulong) 0) tmp=(ulonglong) ~(ulong) 0; *rec_per_key_part=(ulong) tmp; |