• mmakela's avatar
    branches/innodb+: Merge revisions 6801:6853 from branches/zip: · b04d3081
    mmakela authored
      ------------------------------------------------------------------------
      r6805 | inaam | 2010-03-11 23:15:17 +0200 (Thu, 11 Mar 2010) | 6 lines
      Changed paths:
         M /branches/zip/os/os0file.c
    
      branches/zip issue#463
    
      Fixed compiler warning about uninitialized variable.
    
      Non-functional change.
      ------------------------------------------------------------------------
      r6828 | calvin | 2010-03-17 17:16:38 +0200 (Wed, 17 Mar 2010) | 7 lines
      Changed paths:
         M /branches/zip/CMakeLists.txt
    
      branches/zip: rename IB_HAVE_PAUSE_INSTRUCTION to
      HAVE_IB_PAUSE_INSTRUCTION in CMakeLists.txt.
    
      The rename was done as r5871, but CMakeLists.txt was
      forgotten. Also, add INNODB_RW_LOCKS_USE_ATOMICS to
      CMake.
      ------------------------------------------------------------------------
      r6830 | marko | 2010-03-18 09:48:18 +0200 (Thu, 18 Mar 2010) | 3 lines
      Changed paths:
         M /branches/zip/ChangeLog
         M /branches/zip/include/buf0buf.ic
    
      branches/zip: buf_page_peek_if_too_old(): Use 32-bit arithmetics
      when comparing the age of access_time to buf_LRU_old_threshold_ms.
      This fixes a bug on 64-bit systems.
      ------------------------------------------------------------------------
      r6840 | calvin | 2010-03-19 00:32:23 +0200 (Fri, 19 Mar 2010) | 6 lines
      Changed paths:
         M /branches/zip/CMakeLists.txt
         M /branches/zip/ChangeLog
    
      branches/zip: Fix Bug #52102 InnoDB Plugin shows performance drop
      comparing to builtin InnoDB (Windows only).
    
      Disable Windows atomics by default.
    
      Approved by: Inaam
      ------------------------------------------------------------------------
      r6853 | marko | 2010-03-22 13:35:29 +0200 (Mon, 22 Mar 2010) | 1 line
      Changed paths:
         M /branches/zip/include/sync0rw.h
         M /branches/zip/include/sync0sync.h
    
      branches/zip: mutex_own(), rw_lock_own(): Add attribute((warn_unused_result)).
      ------------------------------------------------------------------------
    b04d3081
CMakeLists.txt 7.98 KB