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 0bfda2bc848131554f200bb26fa845bbd731aa14..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
-@@ -9604,9 +9604,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);
  
-@@ -9621,10 +9620,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);
-@@ -9653,9 +9650,8 @@
+@@ -9758,9 +9755,8 @@
                        continue;
                }
  
@@ -44,7 +44,7 @@
                buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
                                      (ulong) lock->count_os_wait);
  
-@@ -9669,10 +9665,8 @@
+@@ -9774,10 +9770,8 @@
  
        if (block_lock) {
                buf1len = (uint) my_snprintf(buf1, sizeof buf1,
@@ -128,7 +128,7 @@
        unsigned        last_s_line:14; /*!< Line number where last time s-locked */
        unsigned        last_x_line:14; /*!< Line number where last time x-locked */
  #ifdef UNIV_DEBUG
-@@ -692,10 +693,10 @@
+@@ -693,10 +694,10 @@
  # ifdef UNIV_SYNC_DEBUG
        ulint           level,          /*!< in: level */
  # endif /* UNIV_SYNC_DEBUG */
@@ -144,7 +144,7 @@
  Performance schema instrumented wrap function for rw_lock_x_lock_func()
 --- a/storage/innobase/include/sync0rw.ic
 +++ b/storage/innobase/include/sync0rw.ic
-@@ -640,10 +640,10 @@
+@@ -641,10 +641,10 @@
  #  ifdef UNIV_SYNC_DEBUG
        ulint           level,          /*!< in: level */
  #  endif /* UNIV_SYNC_DEBUG */
@@ -158,7 +158,7 @@
  {
        /* Initialize the rwlock for performance schema */
        lock->pfs_psi = (PSI_server && PFS_IS_INSTRUMENTED(key))
-@@ -656,10 +656,10 @@
+@@ -657,10 +657,10 @@
  #  ifdef UNIV_SYNC_DEBUG
                            level,
  #  endif /* UNIV_SYNC_DEBUG */
@@ -244,7 +244,7 @@
  /******************************************************************//**
  NOTE! Please use the corresponding macro mutex_enter(), not directly
  this function!
-@@ -733,9 +733,9 @@
+@@ -728,9 +728,9 @@
        ulint   line;           /*!< Line where the mutex was locked */
        ulint   level;          /*!< Level in the global latching order */
  #endif /* UNIV_SYNC_DEBUG */
@@ -255,7 +255,7 @@
        os_thread_id_t thread_id; /*!< The thread id of the thread
                                which locked the mutex. */
        ulint           magic_n;        /*!< MUTEX_MAGIC_N */
-@@ -750,9 +750,9 @@
+@@ -745,9 +745,9 @@
        ulong           count_os_yield; /*!< count of os_wait */
        ulonglong       lspent_time;    /*!< mutex os_wait timer msec */
        ulonglong       lmax_spent_time;/*!< mutex os_wait timer msec */
@@ -268,7 +268,7 @@
                                        instrumentation hook */
 --- a/storage/innobase/include/sync0sync.ic
 +++ b/storage/innobase/include/sync0sync.ic
-@@ -321,13 +321,13 @@
+@@ -320,13 +320,13 @@
        mysql_pfs_key_t key,            /*!< in: Performance Schema key */
        mutex_t*        mutex,          /*!< in: pointer to memory */
  # ifdef UNIV_DEBUG
@@ -285,7 +285,7 @@
  {
        mutex->pfs_psi = (PSI_server && PFS_IS_INSTRUMENTED(key))
                                ? PSI_server->init_mutex(key, mutex)
-@@ -335,13 +335,13 @@
+@@ -334,13 +334,13 @@
  
        mutex_create_func(mutex,
  # ifdef UNIV_DEBUG
@@ -406,7 +406,7 @@
                }
  
                /* these stats may not be accurate */
-@@ -665,10 +662,9 @@
+@@ -668,10 +665,9 @@
        if (srv_print_latch_waits) {
                fprintf(stderr,
                        "Thread %lu spin wait rw-x-lock at %p"
@@ -419,7 +419,7 @@
        }
  
        sync_array_reserve_cell(sync_primary_wait_array,
-@@ -689,10 +685,9 @@
+@@ -692,10 +688,9 @@
        if (srv_print_latch_waits) {
                fprintf(stderr,
                        "Thread %lu OS wait for rw-x-lock at %p"