← Back to branch summary

~sergei.glushchenko/+junk/page-scan-hack

« back to all changes in this revision

Viewing changes to patches/tar4ibd_libtar-1.2.11.patch

  • Committer: Alexey Kopytov
  • Date: 2012-02-02 20:33:49 UTC
  • Revision ID: akopytov@gmail.com-20120202203349-9i0sjxr33sfs15tu
Cherrypick of bugfix for: Bug #891496: tar4ibd crashes on multi-file tablespace files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/tar4ibd_libtar-1.2.11.patch
416
416
+               fcntl(filefd, F_SETFL, O_DIRECT);
417
417
+#endif
418
418
+
419
 
+       zip_size = fil_fd_get_zip_size(filefd);
 
419
+       is_sys_space = (fil_fd_get_space_id(filefd) == 0);
 
420
+
 
421
+       zip_size = is_sys_space ? 0 : fil_fd_get_zip_size(filefd);
420
422
+       if (zip_size == -1) {
421
423
+               fprintf(stderr,
422
424
+                       "tar4ibd: file '%s' has invalid zip_size value.\n",
426
428
+               page_size = zip_size;
427
429
+       }
428
430
+
429
 
+       is_sys_space = (fil_fd_get_space_id(filefd) == 0);
430
 
+
431
431
+       n_retry = 0;
432
432
        size = th_get_size(t);
433
433
-       for (i = size; i > T_BLOCKSIZE; i -= T_BLOCKSIZE)