← Back to branch summary

~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to innodb_show_status.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_show_status.patch
96
96
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
97
97
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-03 15:06:58.727955654 +0900
98
98
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-03 15:07:31.799376984 +0900
99
 
@@ -585,6 +585,8 @@
 
99
@@ -604,6 +604,8 @@
100
100
   (char*) &export_vars.innodb_buffer_pool_pages_dirty,   SHOW_LONG},
101
101
   {"buffer_pool_pages_flushed",
102
102
   (char*) &export_vars.innodb_buffer_pool_pages_flushed,  SHOW_LONG},
105
105
   {"buffer_pool_pages_free",
106
106
   (char*) &export_vars.innodb_buffer_pool_pages_free,    SHOW_LONG},
107
107
 #ifdef UNIV_DEBUG
108
 
@@ -10977,6 +10979,16 @@
 
108
@@ -11050,6 +11052,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
 
@@ -11164,7 +11176,7 @@
 
125
@@ -11237,7 +11249,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
 
@@ -11249,6 +11261,8 @@
 
134
@@ -11330,6 +11342,8 @@
135
135
   MYSQL_SYSVAR(thread_concurrency),
136
136
   MYSQL_SYSVAR(thread_sleep_delay),
137
137
   MYSQL_SYSVAR(autoinc_lock_mode),
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
 
@@ -318,6 +321,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
 
@@ -699,6 +704,7 @@
 
208
@@ -717,6 +722,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 */
340
340
 /** Maximum number of times allowed to conditionally acquire
341
341
 mutex before switching to blocking wait on the mutex */
342
342
 #define MAX_MUTEX_NOWAIT       20
343
 
@@ -313,6 +317,7 @@
 
343
@@ -318,6 +322,7 @@
344
344
 /* variable to count the number of pages that were written from buffer
345
345
 pool to the disk */
346
346
 UNIV_INTERN ulint srv_buf_pool_flushed = 0;
348
348
 
349
349
 /** Number of buffer pool reads that led to the
350
350
 reading of a disk page */
351
 
@@ -1821,6 +1826,13 @@
 
351
@@ -1826,6 +1831,13 @@
352
352
        ulint   n_reserved;
353
353
        ibool   ret;
354
354
 
362
362
        mutex_enter(&srv_innodb_monitor_mutex);
363
363
 
364
364
        current_time = time(NULL);
365
 
@@ -1869,31 +1881,6 @@
 
365
@@ -1874,31 +1886,6 @@
366
366
 
367
367
        mutex_exit(&dict_foreign_err_mutex);
368
368
 
394
394
        fputs("--------\n"
395
395
              "FILE I/O\n"
396
396
              "--------\n", file);
397
 
@@ -1924,10 +1911,84 @@
 
397
@@ -1929,10 +1916,84 @@
398
398
              "BUFFER POOL AND MEMORY\n"
399
399
              "----------------------\n", file);
400
400
        fprintf(file,
483
483
        fprintf(file, "Dictionary memory allocated " ULINTPF "\n",
484
484
                dict_sys->size);
485
485
 
486
 
@@ -1943,6 +2004,16 @@
 
486
@@ -1948,6 +2009,16 @@
487
487
        fprintf(file, "%lu read views open inside InnoDB\n",
488
488
                UT_LIST_GET_LEN(trx_sys->view_list));
489
489
 
500
500
        n_reserved = fil_space_get_n_reserved_extents(0);
501
501
        if (n_reserved > 0) {
502
502
                fprintf(file,
503
 
@@ -1986,6 +2057,31 @@
 
503
@@ -1991,6 +2062,31 @@
504
504
        srv_n_rows_deleted_old = srv_n_rows_deleted;
505
505
        srv_n_rows_read_old = srv_n_rows_read;
506
506
 
532
532
        fputs("----------------------------\n"
533
533
              "END OF INNODB MONITOR OUTPUT\n"
534
534
              "============================\n", file);
535
 
@@ -2029,6 +2125,7 @@
 
535
@@ -2034,6 +2130,7 @@
536
536
                = srv_buf_pool_write_requests;
537
537
        export_vars.innodb_buffer_pool_wait_free = srv_buf_pool_wait_free;
538
538
        export_vars.innodb_buffer_pool_pages_flushed = srv_buf_pool_flushed;