- up to 5.5.18

[packages/mysql.git] / innodb_bug60788.patch

diff --git a/innodb_bug60788.patch b/innodb_bug60788.patch
index d1e2cc44a918c8b94019bf7642c717867ec9d719..d043fb4c04a6932ad046df12f2687cd3b6b2a5eb 100644 (file)
--- a/innodb_bug60788.patch
+++ b/innodb_bug60788.patch
@@ -7,10 +7,9 @@
 # Changes InnoDB IO code so that fsync(), pread() and pwrite() are restarted
 # when interrupted by a signal.
 #
-diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
---- a/storage/innobase/os/os0file.c    2011-04-20 12:09:57.000000000 +0400
-+++ b/storage/innobase/os/os0file.c    2011-04-20 12:10:04.000000000 +0400
-@@ -2083,6 +2083,9 @@
+--- a/storage/innobase/os/os0file.c
++++ b/storage/innobase/os/os0file.c
+@@ -2093,6 +2093,9 @@
                        failures++;
  
                        retry = TRUE;
@@ -20,7 +19,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
                } else {
  
                        retry = FALSE;
-@@ -2212,6 +2215,7 @@
+@@ -2223,6 +2226,7 @@
        off_t   offs;
  #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
        ssize_t n_bytes;
@@ -28,7 +27,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
  #endif /* HAVE_PREAD && !HAVE_BROKEN_PREAD */
        ulint           sec;
        ulint           ms;
-@@ -2252,7 +2256,18 @@
+@@ -2263,7 +2267,18 @@
        os_n_pending_reads++;
        os_mutex_exit(os_file_count_mutex);
  
@@ -48,7 +47,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
  
        os_mutex_enter(os_file_count_mutex);
        os_file_n_pending_preads--;
-@@ -2271,6 +2286,7 @@
+@@ -2282,6 +2297,7 @@
        {
                off_t   ret_offset;
                ssize_t ret;
@@ -56,7 +55,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
  #ifndef UNIV_HOTBACKUP
                ulint   i;
  #endif /* !UNIV_HOTBACKUP */
-@@ -2291,7 +2307,17 @@
+@@ -2302,7 +2318,17 @@
                if (ret_offset < 0) {
                        ret = -1;
                } else {
@@ -75,7 +74,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
                }
  
  #ifndef UNIV_HOTBACKUP
-@@ -2330,6 +2356,7 @@
+@@ -2341,6 +2367,7 @@
                                offset */
  {
        ssize_t ret;
@@ -83,7 +82,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
        off_t   offs;
  
        ut_a((offset & 0xFFFFFFFFUL) == offset);
-@@ -2357,7 +2384,18 @@
+@@ -2368,7 +2395,18 @@
        os_n_pending_writes++;
        os_mutex_exit(os_file_count_mutex);
  
@@ -103,7 +102,7 @@ diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
  
        os_mutex_enter(os_file_count_mutex);
        os_file_n_pending_pwrites--;
-@@ -2404,7 +2442,17 @@
+@@ -2415,7 +2453,17 @@
                        goto func_exit;
                }