diff options
| author | unknown <monty@work.mysql.com> | 2001-09-04 01:04:32 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-04 01:04:32 +0200 |
| commit | 54e33e272d75345b09190052bb0c7d52cce56fc8 (patch) | |
| tree | aaf42ebc12881df70581f25e72e0a95304a405ae /myisam/mi_check.c | |
| parent | 5160501770aafc0b2b9ee287e5a8b7627b1b51bb (diff) | |
| parent | 3b7bd02ebd175fd1e14e6e57e59e60af0a36f68f (diff) | |
| download | mariadb-git-54e33e272d75345b09190052bb0c7d52cce56fc8.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
Docs/manual.texi:
Auto merged
client/mysqldump.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'myisam/mi_check.c')
| -rw-r--r-- | myisam/mi_check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 09f5dcc1ec9..a15427b7838 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -2542,7 +2542,7 @@ int sort_write_record(SORT_INFO *sort_info) info->checksum=mi_checksum(info,sort_info->record); reclength=_mi_rec_pack(info,from,sort_info->record); info->s->state.checksum+=info->checksum; - block_length=reclength+ 3 +test(reclength > 65532L); + block_length=reclength+ 3 + test(reclength >= (65520-3)); if (block_length < share->base.min_block_length) block_length=share->base.min_block_length; flag=0; |