diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-03 12:33:13 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 12:33:13 +0300 |
| commit | f5feb33773cfbce726342e00bea5c436a5553554 (patch) | |
| tree | 6f998a1c6569b65acd1c6e4b47301819545b012c /myisam | |
| parent | e9635c95afae837e2e7cfe85f0fe7ab7eda23aac (diff) | |
| parent | 68fc04c4236b57a3a83d5731fb991329d6be95ef (diff) | |
| download | mariadb-git-f5feb33773cfbce726342e00bea5c436a5553554.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.
BitKeeper/etc/logging_ok:
auto-union
sql/log.cc:
Auto merged
client/client_priv.h:
Merge with 3.23
client/mysqldump.c:
Merge with 3.23
myisam/mi_dynrec.c:
Merge with 3.23
mysql-test/t/myisam.test:
Merge with 3.23
sql/log_event.cc:
Merge with 3.23
sql/slave.cc:
Merge with 3.23
sql/sql_delete.cc:
Merge with 3.23
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) |