← Back to branch summary

~vlad-lesin/percona-server/pintables

« back to all changes in this revision

Viewing changes to innodb_show_lock_name.patch

  • Committer: Laurynas Biveinis
  • Date: 2011-06-21 02:36:36 UTC
  • mfrom: (123 merge)
  • mto: This revision was merged to the branch mainline in revision 124.
  • Revision ID: laurynas.biveinis@percona.com-20110621023636-ccp1iyyrncj181zt
Merge from lp:percona-server

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_show_lock_name.patch
8
8
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
9
9
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:34:35.285040381 +0900
10
10
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:35:12.974975252 +0900
11
 
@@ -9588,9 +9588,8 @@
 
11
@@ -9593,9 +9593,8 @@
12
12
                        rw_lock_wait_time += mutex->lspent_time;
13
13
                }
14
14
 #else /* UNIV_DEBUG */
20
20
                buf2len= (uint) my_snprintf(buf2, sizeof(buf2), "os_waits=%lu",
21
21
                                     (ulong) mutex->count_os_wait);
22
22
 
23
 
@@ -9605,10 +9604,8 @@
 
23
@@ -9610,10 +9609,8 @@
24
24
 
25
25
        if (block_mutex) {
26
26
                buf1len = (uint) my_snprintf(buf1, sizeof buf1,
33
33
                buf2len = (uint) my_snprintf(buf2, sizeof buf2,
34
34
                                             "os_waits=%lu",
35
35
                                             (ulong) block_mutex_oswait_count);
36
 
@@ -9637,9 +9634,8 @@
 
36
@@ -9642,9 +9639,8 @@
37
37
                        continue;
38
38
                }
39
39
 
45
45
                buf2len = my_snprintf(buf2, sizeof buf2, "os_waits=%lu",
46
46
                                      (ulong) lock->count_os_wait);
47
47
 
48
 
@@ -9653,10 +9649,8 @@
 
48
@@ -9658,10 +9654,8 @@
49
49
 
50
50
        if (block_lock) {
51
51
                buf1len = (uint) my_snprintf(buf1, sizeof buf1,
248
248
 /******************************************************************//**
249
249
 NOTE! Please use the corresponding macro mutex_enter(), not directly
250
250
 this function!
251
 
@@ -722,9 +722,9 @@
 
251
@@ -731,9 +731,9 @@
252
252
        ulint   line;           /*!< Line where the mutex was locked */
253
253
        ulint   level;          /*!< Level in the global latching order */
254
254
 #endif /* UNIV_SYNC_DEBUG */
259
259
        os_thread_id_t thread_id; /*!< The thread id of the thread
260
260
                                which locked the mutex. */
261
261
        ulint           magic_n;        /*!< MUTEX_MAGIC_N */
262
 
@@ -739,9 +739,9 @@
 
262
@@ -748,9 +748,9 @@
263
263
        ulong           count_os_yield; /*!< count of os_wait */
264
264
        ulonglong       lspent_time;    /*!< mutex os_wait timer msec */
265
265
        ulonglong       lmax_spent_time;/*!< mutex os_wait timer msec */