mysqlhotcopy: do not fail storing slave status if master status can't be fetched

[packages/mysql.git] / innodb_show_lock_name.patch

diff --git a/innodb_show_lock_name.patch b/innodb_show_lock_name.patch
index 8ac0ddbc65d41d3279957d2b91b2a9e7b83d3837..2fd62c16cb3bd2aa6dec67135e79c2e5699b5f46 100644 (file)
--- a/innodb_show_lock_name.patch
+++ b/innodb_show_lock_name.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -9701,9 +9701,8 @@
+@@ -9709,9 +9709,8 @@
                        rw_lock_wait_time += mutex->lspent_time;
                }
  #else /* UNIV_DEBUG */
@@ -19,7 +19,7 @@
                buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
                                     (ulong) mutex->count_os_wait);
  
-@@ -9718,10 +9717,8 @@
+@@ -9726,10 +9725,8 @@
  
        if (block_mutex) {
                buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -32,7 +32,7 @@
                buf2len = (uint) my_snprintf(buf2, sizeof buf2,
                                             "os_waits=%lu",
                                             (ulong) block_mutex_oswait_count);
-@@ -9750,9 +9747,8 @@
+@@ -9758,9 +9755,8 @@
                        continue;
                }
  
@@ -44,7 +44,7 @@
                buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
                                      (ulong) lock->count_os_wait);
  
-@@ -9766,10 +9762,8 @@
+@@ -9774,10 +9770,8 @@
  
        if (block_lock) {
                buf1len = (uint) my_snprintf(buf1, sizeof buf1,