diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-04 22:38:16 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-12-04 22:38:16 +0100 |
| commit | 27f9d2f9291efaca2a96fbda1c68e410abd94767 (patch) | |
| tree | 2f4f53d612a0cd9f17b94287327cb319437f9d7e /storage/connect/filamzip.cpp | |
| parent | dc8a0df0a2c72a974c7e76eb8a3f945e6eed4f15 (diff) | |
| download | mariadb-git-27f9d2f9291efaca2a96fbda1c68e410abd94767.tar.gz | |
Commit updating CONNECT from the 10.1 version
Diffstat (limited to 'storage/connect/filamzip.cpp')
| -rw-r--r-- | storage/connect/filamzip.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/connect/filamzip.cpp b/storage/connect/filamzip.cpp index 56faa555069..d9834e56dcd 100644 --- a/storage/connect/filamzip.cpp +++ b/storage/connect/filamzip.cpp @@ -1404,8 +1404,13 @@ void ZLBFAM::Rewind(void) // We must be positioned after the header block if (CurBlk >= 0) { // Nothing to do if no block read yet if (!Optimized) { // If optimized, fseek will be done in ReadBuffer + size_t st; + rewind(Stream); - fread(Zlenp, sizeof(int), 1, Stream); + + if (!(st = fread(Zlenp, sizeof(int), 1, Stream)) && trace) + htrc("fread error %d in Rewind", errno); + fseek(Stream, *Zlenp + sizeof(int), SEEK_SET); OldBlk = -1; } // endif Optimized |