← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/fil/fil0fil.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-11 09:18:19 UTC
  • mfrom: (2395 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2396.
  • Revision ID: olafvdspek@gmail.com-20110811091819-em9vnmtco1zt6uvm
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/fil/fil0fil.cc
641
641
        fil_system_t*   system, /*!< in: tablespace memory cache */
642
642
        fil_space_t*    space)  /*!< in: space */
643
643
{
644
 
        ib_int64_t      size_bytes;
 
644
        uint64_t        size_bytes;
645
645
        ulint           size_low;
646
646
        ulint           size_high;
647
647
        ibool           ret;
683
683
 
684
684
                os_file_get_size(node->handle, &size_low, &size_high);
685
685
 
686
 
                size_bytes = (((ib_int64_t)size_high) << 32)
687
 
                        + (ib_int64_t)size_low;
 
686
                size_bytes = (((uint64_t)size_high) << 32) + size_low;
688
687
#ifdef UNIV_HOTBACKUP
689
688
                if (space->id == 0) {
690
 
                        node->size = (ulint) (size_bytes / UNIV_PAGE_SIZE);
 
689
                        node->size = size_bytes / UNIV_PAGE_SIZE;
691
690
                        os_file_close(node->handle);
692
691
                        goto add_size;
693
692
                }
764
763
                }
765
764
 
766
765
                if (!(flags & DICT_TF_ZSSIZE_MASK)) {
767
 
                        node->size = (ulint) (size_bytes / UNIV_PAGE_SIZE);
 
766
                        node->size = (ulint)size_bytes / UNIV_PAGE_SIZE;
768
767
                } else {
769
768
                        node->size = (ulint)
770
769
                                (size_bytes
3186
3185
        ulint           flags;
3187
3186
        ulint           size_low;
3188
3187
        ulint           size_high;
3189
 
        ib_int64_t      size;
 
3188
        uint64_t        size;
3190
3189
#ifdef UNIV_HOTBACKUP
3191
3190
        fil_space_t*    space;
3192
3191
#endif
4305
4304
        ut_ad(ut_is_2pow(zip_size));
4306
4305
        ut_ad(buf);
4307
4306
        ut_ad(len > 0);
4308
 
#if (1 << UNIV_PAGE_SIZE_SHIFT) != UNIV_PAGE_SIZE
4309
 
# error "(1 << UNIV_PAGE_SIZE_SHIFT) != UNIV_PAGE_SIZE"
4310
 
#endif
4311
4307
        ut_ad(fil_validate());
4312
4308
#ifndef UNIV_HOTBACKUP
4313
4309
# ifndef UNIV_LOG_DEBUG