diff options
| author | unknown <brian@zim.(none)> | 2005-12-23 12:22:31 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-12-23 12:22:31 -0800 |
| commit | 8ff680920a269c44b620306c801a7dd30a0eedbf (patch) | |
| tree | 35030777a6375ac5331d70c5975b0c7c7b98b297 /storage/archive | |
| parent | 2c88b6395b6343a3849ef0d3cb932ce7f9c282d3 (diff) | |
| download | mariadb-git-8ff680920a269c44b620306c801a7dd30a0eedbf.tar.gz | |
Fix for Antony's push. I've also changed from using the zlib off_t pointer type to my_off_t to fix issues around buggy zlib versions and to make sure file sizes are consistent through out mysql.
mysql-test/r/information_schema.result:
Fix for Antony adding plugins to information schema.
sql/ha_archive.cc:
Fix for now using my_off_t, no need to worry about buggy zlib's anymore.
sql/ha_archive.h:
Update to fix issues with buggy zlib.
storage/archive/azio.c:
Moved to using my_off_t (which should fix problems with most fille system size issues).
storage/archive/azlib.h:
Change to using my_off_t
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/azio.c | 6 | ||||
| -rw-r--r-- | storage/archive/azlib.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/storage/archive/azio.c b/storage/archive/azio.c index 4a08f65ff30..425f26cef15 100644 --- a/storage/archive/azio.c +++ b/storage/archive/azio.c @@ -506,9 +506,9 @@ int azrewind (s) SEEK_END is not implemented, returns error. In this version of the library, azseek can be extremely slow. */ -z_off_t azseek (s, offset, whence) +my_off_t azseek (s, offset, whence) azio_stream *s; - z_off_t offset; + my_off_t offset; int whence; { @@ -589,7 +589,7 @@ z_off_t azseek (s, offset, whence) given compressed file. This position represents a number of bytes in the uncompressed data stream. */ -z_off_t ZEXPORT aztell (file) +my_off_t ZEXPORT aztell (file) azio_stream *file; { return azseek(file, 0L, SEEK_CUR); diff --git a/storage/archive/azlib.h b/storage/archive/azlib.h index 0c2daaea940..e63d1ed9997 100644 --- a/storage/archive/azlib.h +++ b/storage/archive/azlib.h @@ -166,9 +166,9 @@ typedef struct azio_stream { char *msg; /* error message */ int transparent; /* 1 if input file is not a .gz file */ char mode; /* 'w' or 'r' */ - z_off_t start; /* start of compressed data in file (header skipped) */ - z_off_t in; /* bytes into deflate or inflate */ - z_off_t out; /* bytes out of deflate or inflate */ + my_off_t start; /* start of compressed data in file (header skipped) */ + my_off_t in; /* bytes into deflate or inflate */ + my_off_t out; /* bytes out of deflate or inflate */ int back; /* one character push-back */ int last; /* true if push-back is last character */ } azio_stream; @@ -232,8 +232,8 @@ extern int azflush(azio_stream *file, int flush); degrade compression. */ -extern z_off_t azseek (azio_stream *file, - z_off_t offset, int whence); +extern my_off_t azseek (azio_stream *file, + my_off_t offset, int whence); /* Sets the starting position for the next gzread or gzwrite on the given compressed file. The offset represents a number of bytes in the @@ -257,7 +257,7 @@ extern int azrewind(azio_stream *file); gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) */ -extern z_off_t aztell(azio_stream *file); +extern my_off_t aztell(azio_stream *file); /* Returns the starting position for the next gzread or gzwrite on the given compressed file. This position represents a number of bytes in the |