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 /sql/ha_archive.h | |
| 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 'sql/ha_archive.h')
| -rw-r--r-- | sql/ha_archive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_archive.h b/sql/ha_archive.h index 2df23eec6c3..7b957060f34 100644 --- a/sql/ha_archive.h +++ b/sql/ha_archive.h @@ -51,7 +51,7 @@ class ha_archive: public handler THR_LOCK_DATA lock; /* MySQL lock */ ARCHIVE_SHARE *share; /* Shared lock info */ azio_stream archive; /* Archive file we are working with */ - z_off_t current_position; /* The position of the row we just read */ + my_off_t current_position; /* The position of the row we just read */ byte byte_buffer[IO_SIZE]; /* Initial buffer for our string */ String buffer; /* Buffer used for blob storage */ ha_rows scan_rows; /* Number of rows left in scan */ |