← Back to branch summary

~percona-dev/percona-server/release-5.1.57-12.8-commit108486

« back to all changes in this revision

Viewing changes to innodb_extend_slow.patch

  • Committer: kinoyasu
  • Date: 2010-11-02 10:09:06 UTC
  • Revision ID: kinoyasu@gauntlet4-20101102100906-2ck0vldhd8d3xe79
port maintainer-Yasufumi patches for 5.1.52

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_extend_slow.patch
428
428
 /*********************************************************************//**
429
429
 Construct ha_innobase handler. */
430
430
 UNIV_INTERN
431
 
@@ -8930,6 +8966,25 @@
 
431
@@ -8929,6 +8965,25 @@
432
432
        statement has ended */
433
433
 
434
434
        if (trx->n_mysql_tables_in_use == 0) {
661
661
 #include "log0recv.h"
662
662
 #ifndef UNIV_HOTBACKUP
663
663
 # include "os0sync.h"
664
 
@@ -2104,22 +2106,30 @@
 
664
@@ -2085,22 +2087,30 @@
665
665
 /*******************************************************************//**
666
666
 Does a synchronous read operation in Posix.
667
667
 @return        number of bytes read, -1 if error */
694
694
 
695
695
        ut_a((offset & 0xFFFFFFFFUL) == offset);
696
696
 
697
 
@@ -2140,6 +2150,15 @@
 
697
@@ -2121,6 +2131,15 @@
698
698
 
699
699
        os_n_file_reads++;
700
700
 
710
710
 #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
711
711
        os_mutex_enter(os_file_count_mutex);
712
712
        os_file_n_pending_preads++;
713
 
@@ -2153,6 +2172,13 @@
 
713
@@ -2134,6 +2153,13 @@
714
714
        os_n_pending_reads--;
715
715
        os_mutex_exit(os_file_count_mutex);
716
716
 
724
724
        return(n_bytes);
725
725
 #else
726
726
        {
727
 
@@ -2189,6 +2215,13 @@
 
727
@@ -2170,6 +2196,13 @@
728
728
                os_n_pending_reads--;
729
729
                os_mutex_exit(os_file_count_mutex);
730
730
 
738
738
                return(ret);
739
739
        }
740
740
 #endif
741
 
@@ -2319,7 +2352,7 @@
 
741
@@ -2300,7 +2333,7 @@
742
742
 @return        TRUE if request was successful, FALSE if fail */
743
743
 UNIV_INTERN
744
744
 ibool
747
747
 /*=========*/
748
748
        os_file_t       file,   /*!< in: handle to a file */
749
749
        void*           buf,    /*!< in: buffer where to read */
750
 
@@ -2327,7 +2360,8 @@
 
750
@@ -2308,7 +2341,8 @@
751
751
                                offset where to read */
752
752
        ulint           offset_high, /*!< in: most significant 32 bits of
753
753
                                offset */
757
757
 {
758
758
 #ifdef __WIN__
759
759
        BOOL            ret;
760
 
@@ -2399,7 +2433,7 @@
 
760
@@ -2380,7 +2414,7 @@
761
761
        os_bytes_read_since_printout += n;
762
762
 
763
763
 try_again:
766
766
 
767
767
        if ((ulint)ret == n) {
768
768
 
769
 
@@ -3364,7 +3398,8 @@
 
769
@@ -3345,7 +3379,8 @@
770
770
                                offset */
771
771
        ulint           offset_high, /*!< in: most significant 32 bits of
772
772
                                offset */
776
776
 {
777
777
        os_aio_slot_t*  slot;
778
778
 #ifdef WIN_ASYNC_IO
779
 
@@ -3648,10 +3683,11 @@
 
779
@@ -3629,10 +3664,11 @@
780
780
                                (can be used to identify a completed
781
781
                                aio operation); ignored if mode is
782
782
                                OS_AIO_SYNC */
789
789
 {
790
790
        os_aio_array_t* array;
791
791
        os_aio_slot_t*  slot;
792
 
@@ -3690,8 +3726,8 @@
 
792
@@ -3671,8 +3707,8 @@
793
793
                wait in the Windows case. */
794
794
 
795
795
                if (type == OS_FILE_READ) {
800
800
                }
801
801
 
802
802
                ut_a(type == OS_FILE_WRITE);
803
 
@@ -3724,8 +3760,13 @@
 
803
@@ -3705,8 +3741,13 @@
804
804
                ut_error;
805
805
        }
806
806