X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=innodb_deadlock_count.patch;h=082ab72e32bca9f758938f0e8561fa7c348d9acd;hb=f7ab7acd167af4e8cd4a0fb1284be95fec9d0e89;hp=ff8f579a7533379863020b013b49c6023a644dc5;hpb=d8778560c3ad234c7f677f03c6d083db4256daae;p=packages%2Fmysql.git

diff --git a/innodb_deadlock_count.patch b/innodb_deadlock_count.patch
index ff8f579..082ab72 100644
--- a/innodb_deadlock_count.patch
+++ b/innodb_deadlock_count.patch
@@ -8,7 +8,7 @@
 diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
 --- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:09:53.145500265 +0900
 +++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:10:24.605515894 +0900
-@@ -668,6 +668,8 @@
+@@ -686,6 +686,8 @@
    (char*) &export_vars.innodb_dblwr_pages_written,	  SHOW_LONG},
    {"dblwr_writes",
    (char*) &export_vars.innodb_dblwr_writes,		  SHOW_LONG},
@@ -53,7 +53,7 @@ diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.
 diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
 --- a/storage/innobase/srv/srv0srv.c	2010-12-04 15:57:13.069513371 +0900
 +++ b/storage/innobase/srv/srv0srv.c	2010-12-04 16:10:24.610593039 +0900
-@@ -467,6 +467,7 @@
+@@ -468,6 +468,7 @@
  static ulint	srv_n_rows_deleted_old		= 0;
  static ulint	srv_n_rows_read_old		= 0;
  
@@ -61,7 +61,7 @@ diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
  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;
-@@ -2285,6 +2286,7 @@
+@@ -2282,6 +2283,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;