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 | 8efe675defa2e40cf7300b167e2dfe922caeea7b (patch) | |
| tree | c0eafd444d485cadb6d63aa0e7039389526e282c /myisam | |
| parent | e6088385c582e5a5c645fe4cf5fcb64d83beb9df (diff) | |
| download | mariadb-git-8efe675defa2e40cf7300b167e2dfe922caeea7b.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')
| -rw-r--r-- | myisam/mi_check.c | 2 | ||||
| -rw-r--r-- | myisam/mi_dynrec.c | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c index e090498f3fe..c9fe493744d 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -178,7 +178,7 @@ static int _mi_find_writepos(MI_INFO *info, { /* No deleted blocks; Allocate a new block */ *filepos=info->state->data_file_length; - if ((*length=reclength+3 + test(reclength > 65520)) < + if ((*length=reclength+3 + test(reclength >= (65520-3))) < info->s->base.min_block_length) *length=info->s->base.min_block_length; else |