← Back to branch summary

~percona-core/percona-server/5.1

« back to all changes in this revision

Viewing changes to innodb_bug60788.patch

  • Committer: Stewart Smith
  • Date: 2011-06-30 23:27:31 UTC
  • mfrom: (248.1.1 5.1.57-tmp)
  • Revision ID: stewart@flamingspork.com-20110630232731-a8x3ursiocy7ys5y
merge fdatasync() usage for innodb log files

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_bug60788.patch
10
10
diff -ruN a/storage/innodb_plugin/os/os0file.c b/storage/innodb_plugin/os/os0file.c
11
11
--- a/storage/innodb_plugin/os/os0file.c        2011-04-18 13:21:07.000000000 +0400
12
12
+++ b/storage/innodb_plugin/os/os0file.c        2011-04-18 17:38:21.000000000 +0400
13
 
@@ -1978,6 +1978,9 @@
 
13
@@ -1987,6 +1987,9 @@
14
14
                        failures++;
15
15
 
16
16
                        retry = TRUE;
20
20
                } else {
21
21
 
22
22
                        retry = FALSE;
23
 
@@ -2109,6 +2112,7 @@
 
23
@@ -2119,6 +2122,7 @@
24
24
        off_t   offs;
25
25
 #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
26
26
        ssize_t n_bytes;
28
28
 #endif /* HAVE_PREAD && !HAVE_BROKEN_PREAD */
29
29
        ulint           sec;
30
30
        ulint           ms;
31
 
@@ -2149,7 +2153,18 @@
 
31
@@ -2159,7 +2163,18 @@
32
32
        os_n_pending_reads++;
33
33
        os_mutex_exit(os_file_count_mutex);
34
34
 
48
48
 
49
49
        os_mutex_enter(os_file_count_mutex);
50
50
        os_file_n_pending_preads--;
51
 
@@ -2168,6 +2183,7 @@
 
51
@@ -2178,6 +2193,7 @@
52
52
        {
53
53
                off_t   ret_offset;
54
54
                ssize_t ret;
56
56
 #ifndef UNIV_HOTBACKUP
57
57
                ulint   i;
58
58
 #endif /* !UNIV_HOTBACKUP */
59
 
@@ -2188,7 +2204,17 @@
 
59
@@ -2198,7 +2214,17 @@
60
60
                if (ret_offset < 0) {
61
61
                        ret = -1;
62
62
                } else {
75
75
                }
76
76
 
77
77
 #ifndef UNIV_HOTBACKUP
78
 
@@ -2227,6 +2253,7 @@
 
78
@@ -2237,6 +2263,7 @@
79
79
                                offset */
80
80
 {
81
81
        ssize_t ret;
83
83
        off_t   offs;
84
84
 
85
85
        ut_a((offset & 0xFFFFFFFFUL) == offset);
86
 
@@ -2254,7 +2281,18 @@
 
86
@@ -2264,7 +2291,18 @@
87
87
        os_n_pending_writes++;
88
88
        os_mutex_exit(os_file_count_mutex);
89
89
 
103
103
 
104
104
        os_mutex_enter(os_file_count_mutex);
105
105
        os_file_n_pending_pwrites--;
106
 
@@ -2301,7 +2339,17 @@
 
106
@@ -2311,7 +2349,17 @@
107
107
                        goto func_exit;
108
108
                }
109
109