diff options
author | unknown <brian@zim.(none)> | 2007-01-12 20:05:55 -0800 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2007-01-12 20:05:55 -0800 |
commit | 8c2c5767253f87dabd3e664f82921036fc250418 (patch) | |
tree | 331a9db00950e865627b24ba321ad89f8003ebcc /storage/archive/azio.c | |
parent | eb7cd8bd29ada02992d33b6cfe8315733ae61485 (diff) | |
download | mariadb-git-8c2c5767253f87dabd3e664f82921036fc250418.tar.gz |
Final cleanup for new archive internal format. All new headers work.
storage/archive/archive_reader.c:
Added version bit to solve the issue of hitting old archive files when reading them.
storage/archive/azio.c:
Set the compression back on.
storage/archive/ha_archive.cc:
Cleaned up memory allocation ( a bit more logical and less tricky ).
Fixed bug in not setting autoincrement correctly and cleaned up memory usage for optimize
storage/archive/ha_archive.h:
Clean up.
Diffstat (limited to 'storage/archive/azio.c')
-rw-r--r-- | storage/archive/azio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/archive/azio.c b/storage/archive/azio.c index aa2beb563ee..f210fc150c6 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -49,7 +49,7 @@ void read_header(azio_stream *s, unsigned char *buffer); int az_open (azio_stream *s, const char *path, int Flags, File fd) { int err; - int level = Z_NO_COMPRESSION; /* Z_DEFAULT_COMPRESSION;*/ /* compression level */ + int level = Z_DEFAULT_COMPRESSION; /* compression level */ int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ s->stream.zalloc = (alloc_func)0; @@ -165,7 +165,6 @@ void write_header(azio_stream *s) int4store(ptr + AZ_FRM_POS, 0); /* FRM Block */ int4store(ptr + AZ_META_POS, 0); /* Meta Block */ int8store(ptr + AZ_START_POS, (unsigned long long)s->start); /* Start of Data Block Index Block */ - printf("ROWS %llu\n", s->rows); int8store(ptr + AZ_ROW_POS, (unsigned long long)s->rows); /* Start of Data Block Index Block */ int8store(ptr + AZ_FLUSH_POS, (unsigned long long)s->forced_flushes); /* Start of Data Block Index Block */ int8store(ptr + AZ_CHECK_POS, (unsigned long long)s->check_point); /* Start of Data Block Index Block */ |