diff options
| author | monty@narttu.mysql.fi <> | 2003-04-03 12:33:13 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-04-03 12:33:13 +0300 |
| commit | 618857b6eb6e7982bb1f8833f6043909dee092b6 (patch) | |
| tree | 6f998a1c6569b65acd1c6e4b47301819545b012c /myisam | |
| parent | bf315f30d503d2407caa0da124fa6f1fce81efd8 (diff) | |
| parent | 3cdc8ae55b4fd0d711b9784897e3c4a1481ccb04 (diff) | |
| download | mariadb-git-618857b6eb6e7982bb1f8833f6043909dee092b6.tar.gz | |
Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_dynrec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c index d33aa2718b7..dc51269ac35 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -62,7 +62,7 @@ int _mi_write_blob_record(MI_INFO *info, const byte *record) extra= (ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER)+MI_SPLIT_LENGTH+ MI_DYN_DELETE_BLOCK_HEADER+1); - reclength= (info->s->base.pack_reclength+ + reclength= (info->s->base.pack_reclength + info->s->base.pack_bits + _my_calc_total_blob_length(info,record)+ extra); #ifdef NOT_USED /* We now support big rows */ if (reclength > MI_DYN_MAX_ROW_LENGTH) |