- up to 5.5.17

[packages/mysql.git] / innodb_deadlock_count.patch

diff --git a/innodb_deadlock_count.patch b/innodb_deadlock_count.patch
index 44ad06d07829493fc05c437a16cc986b670111fb..4e38012e267656bb795469b95b4a724f9c1d1e1f 100644 (file)
--- a/innodb_deadlock_count.patch
+++ b/innodb_deadlock_count.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
-@@ -687,6 +687,8 @@
+@@ -691,6 +691,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,      SHOW_LONG},
    {"dblwr_writes",
    (char*) &export_vars.innodb_dblwr_writes,             SHOW_LONG},
@@ -28,7 +28,7 @@
  Gets the size of a lock struct.
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -758,6 +758,7 @@
+@@ -767,6 +767,7 @@
        ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
        ulint innodb_dblwr_pages_written;       /*!< srv_dblwr_pages_written */
        ulint innodb_dblwr_writes;              /*!< srv_dblwr_writes */
@@ -48,7 +48,7 @@
                break;
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
-@@ -468,6 +468,7 @@
+@@ -474,6 +474,7 @@
  static ulint  srv_n_rows_deleted_old          = 0;
  static ulint  srv_n_rows_read_old             = 0;
  
@@ -56,7 +56,7 @@
  UNIV_INTERN ulint             srv_n_lock_wait_count           = 0;
  UNIV_INTERN ulint             srv_n_lock_wait_current_count   = 0;
  UNIV_INTERN ib_int64_t        srv_n_lock_wait_time            = 0;
-@@ -2282,6 +2283,7 @@
+@@ -2290,6 +2291,7 @@
        export_vars.innodb_buffer_pool_pages_data = LRU_len;
        export_vars.innodb_buffer_pool_pages_dirty = flush_list_len;
        export_vars.innodb_buffer_pool_pages_free = free_len;