← Back to branch summary

~vlad-lesin/percona-server/pintables

« back to all changes in this revision

Viewing changes to innodb_show_status.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_status.patch
62
62
diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
63
63
--- a/storage/innobase/fil/fil0fil.c    2010-11-03 07:01:13.000000000 +0900
64
64
+++ b/storage/innobase/fil/fil0fil.c    2010-12-03 15:07:31.790357112 +0900
65
 
@@ -4884,3 +4884,30 @@
 
65
@@ -4888,3 +4888,30 @@
66
66
 
67
67
        fil_system = NULL;
68
68
 }
105
105
   {"buffer_pool_pages_free",
106
106
   (char*) &export_vars.innodb_buffer_pool_pages_free,    SHOW_LONG},
107
107
 #ifdef UNIV_DEBUG
108
 
@@ -11074,6 +11076,16 @@
 
108
@@ -11081,6 +11083,16 @@
109
109
   "Force InnoDB to not use next-key locking, to use only row-level locking.",
110
110
   NULL, NULL, FALSE);
111
111
 
122
122
 #ifdef UNIV_LOG_ARCHIVE
123
123
 static MYSQL_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
124
124
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
125
 
@@ -11261,7 +11273,7 @@
 
125
@@ -11268,7 +11280,7 @@
126
126
 
127
127
 static MYSQL_SYSVAR_STR(version, innodb_version_str,
128
128
   PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
131
131
 
132
132
 static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
133
133
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
134
 
@@ -11354,6 +11366,8 @@
 
134
@@ -11361,6 +11373,8 @@
135
135
   MYSQL_SYSVAR(thread_concurrency),
136
136
   MYSQL_SYSVAR(thread_sleep_delay),
137
137
   MYSQL_SYSVAR(autoinc_lock_mode),
186
186
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
187
187
--- a/storage/innobase/include/srv0srv.h        2010-11-03 07:01:13.000000000 +0900
188
188
+++ b/storage/innobase/include/srv0srv.h        2010-12-03 15:07:31.813958103 +0900
189
 
@@ -145,6 +145,9 @@
 
189
@@ -142,6 +142,9 @@
190
190
 extern char    srv_adaptive_flushing;
191
191
 
192
192
 
196
196
 /* The sort order table of the MySQL latin1_swedish_ci character set
197
197
 collation */
198
198
 extern const byte*     srv_latin1_ordering;
199
 
@@ -326,6 +329,8 @@
 
199
@@ -323,6 +326,8 @@
200
200
 buffer pool to disk */
201
201
 extern ulint srv_buf_pool_flushed;
202
202
 
205
205
 /** Number of buffer pool reads that led to the
206
206
 reading of a disk page */
207
207
 extern ulint srv_buf_pool_reads;
208
 
@@ -705,6 +710,7 @@
 
208
@@ -702,6 +707,7 @@
209
209
        ulint innodb_buffer_pool_reads;         /*!< srv_buf_pool_reads */
210
210
        ulint innodb_buffer_pool_wait_free;     /*!< srv_buf_pool_wait_free */
211
211
        ulint innodb_buffer_pool_pages_flushed; /*!< srv_buf_pool_flushed */
309
309
 #include "mysql/plugin.h"
310
310
 #include "mysql/service_thd_wait.h"
311
311
 
312
 
@@ -194,6 +195,9 @@
 
312
@@ -188,6 +189,9 @@
313
313
 the checkpoints. */
314
314
 UNIV_INTERN char       srv_adaptive_flushing   = TRUE;
315
315
 
319
319
 /** Maximum number of times allowed to conditionally acquire
320
320
 mutex before switching to blocking wait on the mutex */
321
321
 #define MAX_MUTEX_NOWAIT       20
322
 
@@ -320,6 +324,7 @@
 
322
@@ -314,6 +318,7 @@
323
323
 /* variable to count the number of pages that were written from buffer
324
324
 pool to the disk */
325
325
 UNIV_INTERN ulint srv_buf_pool_flushed = 0;
327
327
 
328
328
 /** Number of buffer pool reads that led to the
329
329
 reading of a disk page */
330
 
@@ -1814,6 +1819,13 @@
 
330
@@ -1823,6 +1828,13 @@
331
331
        ulint   n_reserved;
332
332
        ibool   ret;
333
333
 
341
341
        mutex_enter(&srv_innodb_monitor_mutex);
342
342
 
343
343
        current_time = time(NULL);
344
 
@@ -1862,31 +1874,6 @@
 
344
@@ -1871,31 +1883,6 @@
345
345
 
346
346
        mutex_exit(&dict_foreign_err_mutex);
347
347
 
373
373
        fputs("--------\n"
374
374
              "FILE I/O\n"
375
375
              "--------\n", file);
376
 
@@ -1917,10 +1904,78 @@
 
376
@@ -1926,10 +1913,78 @@
377
377
              "BUFFER POOL AND MEMORY\n"
378
378
              "----------------------\n", file);
379
379
        fprintf(file,
456
456
        fprintf(file, "Dictionary memory allocated " ULINTPF "\n",
457
457
                dict_sys->size);
458
458
 
459
 
@@ -1936,6 +1991,16 @@
 
459
@@ -1945,6 +2000,16 @@
460
460
        fprintf(file, "%lu read views open inside InnoDB\n",
461
461
                UT_LIST_GET_LEN(trx_sys->view_list));
462
462
 
473
473
        n_reserved = fil_space_get_n_reserved_extents(0);
474
474
        if (n_reserved > 0) {
475
475
                fprintf(file,
476
 
@@ -1979,6 +2044,31 @@
 
476
@@ -1988,6 +2053,31 @@
477
477
        srv_n_rows_deleted_old = srv_n_rows_deleted;
478
478
        srv_n_rows_read_old = srv_n_rows_read;
479
479
 
505
505
        fputs("----------------------------\n"
506
506
              "END OF INNODB MONITOR OUTPUT\n"
507
507
              "============================\n", file);
508
 
@@ -2022,6 +2112,7 @@
 
508
@@ -2031,6 +2121,7 @@
509
509
                = srv_buf_pool_write_requests;
510
510
        export_vars.innodb_buffer_pool_wait_free = srv_buf_pool_wait_free;
511
511
        export_vars.innodb_buffer_pool_pages_flushed = srv_buf_pool_flushed;