diff options
author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-12-04 12:39:49 -0500 |
---|---|---|
committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-12-04 12:39:49 -0500 |
commit | a031e503ddc113da3cb216bc6f962789a4337fc3 (patch) | |
tree | fffdcba24010e246a4e39c87d0b96b0bca1cee6d /myisam | |
parent | 65da49e6a8aa50a30d45257c1035b43f7b98c6fb (diff) | |
parent | 8a223884b97880100fcb683749fb8dc7f955d8a2 (diff) | |
download | mariadb-git-a031e503ddc113da3cb216bc6f962789a4337fc3.tar.gz |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
myisam/myisampack.c:
Auto merged
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/myisampack.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 79359e29a5d..19e09789572 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -2923,6 +2923,8 @@ static void flush_bits(void) bits-= 8; *file_buffer.pos++= (uchar) (bit_buffer >> bits); } + if (file_buffer.pos >= file_buffer.end) + VOID(flush_buffer(~ (ulong) 0)); file_buffer.bits= BITS_SAVED; file_buffer.bitbucket= 0; } |