- up to 5.5.17

[packages/mysql.git] / innodb_show_status.patch

diff --git a/innodb_show_status.patch b/innodb_show_status.patch
index 0be7859ed3b458e9fd3e2e44359a6bf76a60624d..2522447a54ca798226933973aa1f6708c4b31a0b 100644 (file)
--- a/innodb_show_status.patch
+++ b/innodb_show_status.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/buf/buf0buf.c
 +++ b/storage/innobase/buf/buf0buf.c
-@@ -4365,6 +4365,7 @@
+@@ -4426,6 +4426,7 @@
        }
  
        total_info->pool_size += pool_info->pool_size;
@@ -15,7 +15,7 @@
        total_info->lru_len += pool_info->lru_len;
        total_info->old_lru_len += pool_info->old_lru_len;
        total_info->free_list_len += pool_info->free_list_len;
-@@ -4428,6 +4429,8 @@
+@@ -4491,6 +4492,8 @@
  
        pool_info->pool_size = buf_pool->curr_size;
  
@@ -24,7 +24,7 @@
        pool_info->lru_len = UT_LIST_GET_LEN(buf_pool->LRU);
  
        pool_info->old_lru_len = buf_pool->LRU_old_len;
-@@ -4544,14 +4547,16 @@
+@@ -4612,14 +4615,16 @@
        ut_ad(pool_info);
  
        fprintf(file,
@@ -101,7 +101,7 @@
    {"buffer_pool_pages_free",
    (char*) &export_vars.innodb_buffer_pool_pages_free,   SHOW_LONG},
  #ifdef UNIV_DEBUG
-@@ -11097,6 +11099,16 @@
+@@ -11199,6 +11201,16 @@
    "Force InnoDB to not use next-key locking, to use only row-level locking.",
    NULL, NULL, FALSE);
  
@@ -118,7 +118,7 @@
  #ifdef UNIV_LOG_ARCHIVE
  static MYSQL_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11284,7 +11296,7 @@
+@@ -11386,7 +11398,7 @@
  
  static MYSQL_SYSVAR_STR(version, innodb_version_str,
    PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
@@ -127,7 +127,7 @@
  
  static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
-@@ -11378,6 +11390,8 @@
+@@ -11486,6 +11498,8 @@
    MYSQL_SYSVAR(thread_concurrency),
    MYSQL_SYSVAR(thread_sleep_delay),
    MYSQL_SYSVAR(autoinc_lock_mode),
@@ -178,9 +178,9 @@
  Create a consistent cursor view for mysql to be used in cursors. In this
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -142,6 +142,9 @@
- extern char   srv_adaptive_flushing;
- 
+@@ -146,6 +146,9 @@
+ corrupted index and table */
+ extern my_bool        srv_load_corrupted;
  
 +extern ulint    srv_show_locks_held;
 +extern ulint    srv_show_verbose_locks;
@@ -188,7 +188,7 @@
  /* The sort order table of the MySQL latin1_swedish_ci character set
  collation */
  extern const byte*    srv_latin1_ordering;
-@@ -323,6 +326,8 @@
+@@ -328,6 +331,8 @@
  buffer pool to disk */
  extern ulint srv_buf_pool_flushed;
  
@@ -197,14 +197,14 @@
  /** Number of buffer pool reads that led to the
  reading of a disk page */
  extern ulint srv_buf_pool_reads;
-@@ -702,6 +707,7 @@
+@@ -707,6 +712,7 @@
        ulint innodb_buffer_pool_reads;         /*!< srv_buf_pool_reads */
        ulint innodb_buffer_pool_wait_free;     /*!< srv_buf_pool_wait_free */
        ulint innodb_buffer_pool_pages_flushed; /*!< srv_buf_pool_flushed */
 +      ulint innodb_buffer_pool_pages_LRU_flushed;     /*!< buf_lru_flush_page_count */
        ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */
+       ulint innodb_buffer_pool_read_ahead_rnd;/*!< srv_read_ahead_rnd */
        ulint innodb_buffer_pool_read_ahead;    /*!< srv_read_ahead */
-       ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
 --- a/storage/innobase/lock/lock0lock.c
 +++ b/storage/innobase/lock/lock0lock.c
 @@ -4377,6 +4377,7 @@
@@ -308,7 +308,7 @@
  /** Maximum number of times allowed to conditionally acquire
  mutex before switching to blocking wait on the mutex */
  #define MAX_MUTEX_NOWAIT      20
-@@ -314,6 +318,7 @@
+@@ -316,6 +320,7 @@
  /* variable to count the number of pages that were written from buffer
  pool to the disk */
  UNIV_INTERN ulint srv_buf_pool_flushed = 0;
@@ -316,7 +316,7 @@
  
  /** Number of buffer pool reads that led to the
  reading of a disk page */
-@@ -1823,6 +1828,13 @@
+@@ -1825,6 +1830,13 @@
        ulint   n_reserved;
        ibool   ret;
  
@@ -330,7 +330,7 @@
        mutex_enter(&srv_innodb_monitor_mutex);
  
        current_time = time(NULL);
-@@ -1871,31 +1883,6 @@
+@@ -1873,31 +1885,6 @@
  
        mutex_exit(&dict_foreign_err_mutex);
  
@@ -362,7 +362,7 @@
        fputs("--------\n"
              "FILE I/O\n"
              "--------\n", file);
-@@ -1926,10 +1913,78 @@
+@@ -1928,10 +1915,78 @@
              "BUFFER POOL AND MEMORY\n"
              "----------------------\n", file);
        fprintf(file,
@@ -445,7 +445,7 @@
        fprintf(file, "Dictionary memory allocated " ULINTPF "\n",
                dict_sys->size);
  
-@@ -1945,6 +2000,16 @@
+@@ -1947,6 +2002,16 @@
        fprintf(file, "%lu read views open inside InnoDB\n",
                UT_LIST_GET_LEN(trx_sys->view_list));
  
@@ -462,7 +462,7 @@
        n_reserved = fil_space_get_n_reserved_extents(0);
        if (n_reserved > 0) {
                fprintf(file,
-@@ -1988,6 +2053,31 @@
+@@ -1990,6 +2055,31 @@
        srv_n_rows_deleted_old = srv_n_rows_deleted;
        srv_n_rows_read_old = srv_n_rows_read;
  
@@ -494,14 +494,14 @@
        fputs("----------------------------\n"
              "END OF INNODB MONITOR OUTPUT\n"
              "============================\n", file);
-@@ -2031,6 +2121,7 @@
+@@ -2033,6 +2123,7 @@
                = srv_buf_pool_write_requests;
        export_vars.innodb_buffer_pool_wait_free = srv_buf_pool_wait_free;
        export_vars.innodb_buffer_pool_pages_flushed = srv_buf_pool_flushed;
 +      export_vars.innodb_buffer_pool_pages_LRU_flushed = buf_lru_flush_page_count;
        export_vars.innodb_buffer_pool_reads = srv_buf_pool_reads;
-       export_vars.innodb_buffer_pool_read_ahead
-               = stat.n_ra_pages_read;
+       export_vars.innodb_buffer_pool_read_ahead_rnd
+               = stat.n_ra_pages_read_rnd;
 --- a/storage/innobase/sync/sync0arr.c
 +++ b/storage/innobase/sync/sync0arr.c
 @@ -478,7 +478,7 @@