← Back to branch summary

~longbow/percona-server/test_730173_5.5

« back to all changes in this revision

Viewing changes to patches/innodb_show_status.patch

  • Committer: Stewart Smith
  • Date: 2011-11-17 00:21:45 UTC
  • mfrom: (190.2.9 merge)
  • Revision ID: stewart@flamingspork.com-20111117002145-6180fuj12147yk9i
merge 5.5.17 port

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb_show_status.patch
7
7
# should be done or reviewed by the maintainer!
8
8
--- a/storage/innobase/buf/buf0buf.c
9
9
+++ b/storage/innobase/buf/buf0buf.c
10
 
@@ -4369,6 +4369,7 @@
 
10
@@ -4426,6 +4426,7 @@
11
11
        }
12
12
 
13
13
        total_info->pool_size += pool_info->pool_size;
15
15
        total_info->lru_len += pool_info->lru_len;
16
16
        total_info->old_lru_len += pool_info->old_lru_len;
17
17
        total_info->free_list_len += pool_info->free_list_len;
18
 
@@ -4434,6 +4435,8 @@
 
18
@@ -4491,6 +4492,8 @@
19
19
 
20
20
        pool_info->pool_size = buf_pool->curr_size;
21
21
 
24
24
        pool_info->lru_len = UT_LIST_GET_LEN(buf_pool->LRU);
25
25
 
26
26
        pool_info->old_lru_len = buf_pool->LRU_old_len;
27
 
@@ -4555,14 +4558,16 @@
 
27
@@ -4612,14 +4615,16 @@
28
28
        ut_ad(pool_info);
29
29
 
30
30
        fprintf(file,
101
101
   {"buffer_pool_pages_free",
102
102
   (char*) &export_vars.innodb_buffer_pool_pages_free,    SHOW_LONG},
103
103
 #ifdef UNIV_DEBUG
104
 
@@ -11087,6 +11089,16 @@
 
104
@@ -11199,6 +11201,16 @@
105
105
   "Force InnoDB to not use next-key locking, to use only row-level locking.",
106
106
   NULL, NULL, FALSE);
107
107
 
118
118
 #ifdef UNIV_LOG_ARCHIVE
119
119
 static MYSQL_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
120
120
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
121
 
@@ -11274,7 +11286,7 @@
 
121
@@ -11386,7 +11398,7 @@
122
122
 
123
123
 static MYSQL_SYSVAR_STR(version, innodb_version_str,
124
124
   PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
127
127
 
128
128
 static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
129
129
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
130
 
@@ -11373,6 +11385,8 @@
 
130
@@ -11486,6 +11498,8 @@
131
131
   MYSQL_SYSVAR(thread_concurrency),
132
132
   MYSQL_SYSVAR(thread_sleep_delay),
133
133
   MYSQL_SYSVAR(autoinc_lock_mode),
178
178
 Create a consistent cursor view for mysql to be used in cursors. In this
179
179
--- a/storage/innobase/include/srv0srv.h
180
180
+++ b/storage/innobase/include/srv0srv.h
181
 
@@ -142,6 +142,9 @@
182
 
 extern char    srv_adaptive_flushing;
183
 
 
 
181
@@ -146,6 +146,9 @@
 
182
 corrupted index and table */
 
183
 extern my_bool srv_load_corrupted;
184
184
 
185
185
+extern ulint    srv_show_locks_held;
186
186
+extern ulint    srv_show_verbose_locks;
188
188
 /* The sort order table of the MySQL latin1_swedish_ci character set
189
189
 collation */
190
190
 extern const byte*     srv_latin1_ordering;
191
 
@@ -324,6 +327,8 @@
 
191
@@ -328,6 +331,8 @@
192
192
 buffer pool to disk */
193
193
 extern ulint srv_buf_pool_flushed;
194
194
 
197
197
 /** Number of buffer pool reads that led to the
198
198
 reading of a disk page */
199
199
 extern ulint srv_buf_pool_reads;
200
 
@@ -703,6 +708,7 @@
 
200
@@ -707,6 +712,7 @@
201
201
        ulint innodb_buffer_pool_reads;         /*!< srv_buf_pool_reads */
202
202
        ulint innodb_buffer_pool_wait_free;     /*!< srv_buf_pool_wait_free */
203
203
        ulint innodb_buffer_pool_pages_flushed; /*!< srv_buf_pool_flushed */