diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-18 02:15:06 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-18 02:15:06 +0200 |
| commit | 0ffa94682eb3ec86bd3c45fdee68f5ecda5e6ab7 (patch) | |
| tree | e47c14103d1588f6a27c229783e07d73438c96d0 /isam | |
| parent | 19fc413aa25290016069efbc9e25e2e79b3ea7c9 (diff) | |
| download | mariadb-git-0ffa94682eb3ec86bd3c45fdee68f5ecda5e6ab7.tar.gz | |
Portability fixes
Docs/manual.texi:
Updated links and added more examples
client/mysql.cc:
Added --timeout + merge of Jani:s changes
isam/_dynrec.c:
Fixed bug when making big rows 1 byte smaller
scripts/mysqlhotcopy.sh:
Added regexp handling of filenames
sql-bench/test-insert.sh:
More order by tests
sql/mf_iocache.cc:
Cleanup
sql/mysqld.cc:
Moved my_delete() to before master thread died
sql/sql_parse.cc:
Fixed wrong comparison
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/_dynrec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/isam/_dynrec.c b/isam/_dynrec.c index f26e491a58c..42a596fa623 100644 --- a/isam/_dynrec.c +++ b/isam/_dynrec.c @@ -104,7 +104,8 @@ int _nisam_delete_dynamic_record(N_INFO *info) /* Write record to data-file */ -static int write_dynamic_record(N_INFO *info, const byte *record, uint reclength) +static int write_dynamic_record(N_INFO *info, const byte *record, + uint reclength) { int flag; uint length; @@ -142,8 +143,9 @@ static int _nisam_find_writepos(N_INFO *info, *filepos=info->s->state.dellink; block_info.second_read=0; info->rec_cache.seek_not_done=1; - if (!(_nisam_get_block_info(&block_info,info->dfile,info->s->state.dellink) & - BLOCK_DELETED)) + + if (!(_nisam_get_block_info(&block_info,info->dfile, + info->s->state.dellink) & BLOCK_DELETED)) { my_errno=HA_ERR_WRONG_IN_RECORD; DBUG_RETURN(-1); @@ -213,7 +215,7 @@ int _nisam_write_part_record(N_INFO *info, extra_length++; /* One empty */ } } - else if (length-long_block < *reclength+5) + else if (length-long_block*2 < *reclength+5) { /* To short block */ if (next_filepos == NI_POS_ERROR) next_filepos=info->s->state.dellink != NI_POS_ERROR ? |