diff options
author | unknown <monty@hundin.mysql.fi> | 2001-09-04 01:25:34 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-09-04 01:25:34 +0300 |
commit | c693464e9f6ff3281c67e897184c1709fb9d1ae7 (patch) | |
tree | c0eafd444d485cadb6d63aa0e7039389526e282c /myisam/mi_check.c | |
parent | 32f547bcd48bca187ee1fbcf2b60215d622030b4 (diff) | |
download | mariadb-git-c693464e9f6ff3281c67e897184c1709fb9d1ae7.tar.gz |
Ensure that libmysqlclient doesn't use raid
Fix problem with MyISAM and rows of length 65517-65520
Docs/manual.texi:
Changelog
include/raid.h:
Ensure that libmysqlclient doesn't use raid
libmysql/Makefile.am:
Ensure that libmysqlclient doesn't use raid
libmysql_r/Makefile.am:
Ensure that libmysqlclient doesn't use raid
myisam/mi_check.c:
Fix problem with rows of length 65517-65520
myisam/mi_dynrec.c:
Fix problem with rows of length 65517-65520
mysql-test/r/myisam.result:
Test for myisam tables with problematic row lengths
mysql-test/t/myisam.test:
Test for myisam tables with problematic row lengths
sql/log_event.cc:
Portability fix
strings/ctype-euc_kr.c:
Portability fix
strings/ctype-sjis.c:
Portability fix
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 587f90e0929..aedea3ca78b 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -2480,7 +2480,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; |