diff options
| author | serg@serg.mylan <> | 2003-08-12 15:30:47 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2003-08-12 15:30:47 +0200 |
| commit | bc9f6cde5012e239339a840ab14d50fa14950051 (patch) | |
| tree | b98c946de4b65b7b7b518b7cc759c2c093da613b /myisam | |
| parent | ad976d1ea188afc3a2c1bcb9feabaf679bd2e903 (diff) | |
| parent | 06e5657993f20a4caa37db96c05adc9eabc392bb (diff) | |
| download | mariadb-git-bc9f6cde5012e239339a840ab14d50fa14950051.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_dump.c | 4 | ||||
| -rw-r--r-- | myisam/mi_packrec.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/myisam/ft_dump.c b/myisam/ft_dump.c index d95e719e234..69fef529fa9 100644 --- a/myisam/ft_dump.c +++ b/myisam/ft_dump.c @@ -130,7 +130,11 @@ int main(int argc,char *argv[]) #error #endif +#ifdef HAVE_SNPRINTF snprintf(buf,MAX_LEN,"%.*s",(int) keylen,info->lastkey+1); +#else + sprintf(buf,"%.*s",(int) keylen,info->lastkey+1); +#endif casedn_str(buf); total++; lengths[keylen]++; diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index 66cfd169026..7557bb8749f 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -165,7 +165,9 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys) diff_length=(int) rec_reflength - (int) share->base.rec_reflength; if (fix_keys) share->rec_reflength=rec_reflength; - share->base.min_block_length=share->min_pack_length+share->pack.ref_length; + share->base.min_block_length=share->min_pack_length+1; + if (share->min_pack_length > 254) + share->base.min_block_length+=2; if (!(share->decode_trees=(MI_DECODE_TREE*) my_malloc((uint) (trees*sizeof(MI_DECODE_TREE)+ |