- rel. 2

[packages/mysql.git] / innodb_show_status_extend.patch

diff --git a/innodb_show_status_extend.patch b/innodb_show_status_extend.patch
index 2a0ecc7067a06d3a61c0ba035d5003fa97adb1ce..57584291c1db24d940e7c76bd65f98de4bf14419 100644 (file)
--- a/innodb_show_status_extend.patch
+++ b/innodb_show_status_extend.patch
@@ -5,10 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
---- a/storage/innobase/handler/ha_innodb.cc    2011-01-21 19:53:42.369599743 +0900
-+++ b/storage/innobase/handler/ha_innodb.cc    2011-01-21 19:54:44.659599699 +0900
-@@ -638,6 +638,16 @@
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -641,6 +641,16 @@
        trx_t*  trx);   /*!< in: transaction handle */
  
  static SHOW_VAR innodb_status_variables[]= {
@@ -25,7 +24,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
    {"buffer_pool_pages_data",
    (char*) &export_vars.innodb_buffer_pool_pages_data,   SHOW_LONG},
    {"buffer_pool_pages_dirty",
-@@ -652,8 +662,14 @@
+@@ -655,8 +665,14 @@
    {"buffer_pool_pages_latched",
    (char*) &export_vars.innodb_buffer_pool_pages_latched,  SHOW_LONG},
  #endif /* UNIV_DEBUG */
@@ -39,8 +38,8 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
 +  (char*) &export_vars.innodb_buffer_pool_pages_old,    SHOW_LONG},
    {"buffer_pool_pages_total",
    (char*) &export_vars.innodb_buffer_pool_pages_total,          SHOW_LONG},
-   {"buffer_pool_read_ahead",
-@@ -668,6 +684,12 @@
+   {"buffer_pool_read_ahead_rnd",
+@@ -673,6 +689,12 @@
    (char*) &export_vars.innodb_buffer_pool_wait_free,    SHOW_LONG},
    {"buffer_pool_write_requests",
    (char*) &export_vars.innodb_buffer_pool_write_requests, SHOW_LONG},
@@ -53,7 +52,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
    {"data_fsyncs",
    (char*) &export_vars.innodb_data_fsyncs,              SHOW_LONG},
    {"data_pending_fsyncs",
-@@ -694,12 +716,66 @@
+@@ -699,12 +721,66 @@
    (char*) &export_vars.innodb_dict_tables,              SHOW_LONG},
    {"have_atomic_builtins",
    (char*) &export_vars.innodb_have_atomic_builtins,     SHOW_BOOL},
@@ -120,7 +119,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
    {"os_log_fsyncs",
    (char*) &export_vars.innodb_os_log_fsyncs,            SHOW_LONG},
    {"os_log_pending_fsyncs",
-@@ -716,8 +792,14 @@
+@@ -721,8 +797,14 @@
    (char*) &export_vars.innodb_pages_read,               SHOW_LONG},
    {"pages_written",
    (char*) &export_vars.innodb_pages_written,            SHOW_LONG},
@@ -135,7 +134,7 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
    {"row_lock_time",
    (char*) &export_vars.innodb_row_lock_time,            SHOW_LONGLONG},
    {"row_lock_time_avg",
-@@ -734,8 +816,20 @@
+@@ -739,8 +821,20 @@
    (char*) &export_vars.innodb_rows_read,                SHOW_LONG},
    {"rows_updated",
    (char*) &export_vars.innodb_rows_updated,             SHOW_LONG},
@@ -156,10 +155,9 @@ diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_
    {NullS, NullS, SHOW_LONG}
  };
  
-diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
---- a/storage/innobase/ibuf/ibuf0ibuf.c        2011-02-03 15:05:04.000000000 +0900
-+++ b/storage/innobase/ibuf/ibuf0ibuf.c        2011-02-03 15:19:47.000000000 +0900
-@@ -469,6 +469,45 @@
+--- a/storage/innobase/ibuf/ibuf0ibuf.c
++++ b/storage/innobase/ibuf/ibuf0ibuf.c
+@@ -478,6 +478,45 @@
  }
  
  /******************************************************************//**
@@ -205,9 +203,8 @@ diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.
  Updates the size information of the ibuf, assuming the segment size has not
  changed. */
  static
-diff -ruN a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
---- a/storage/innobase/include/ibuf0ibuf.h     2010-12-04 02:58:26.000000000 +0900
-+++ b/storage/innobase/include/ibuf0ibuf.h     2011-02-03 15:19:47.000000000 +0900
+--- a/storage/innobase/include/ibuf0ibuf.h
++++ b/storage/innobase/include/ibuf0ibuf.h
 @@ -438,6 +438,22 @@
  void
  ibuf_close(void);
@@ -231,10 +228,9 @@ diff -ruN a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf
  
  #define IBUF_HEADER_PAGE_NO   FSP_IBUF_HEADER_PAGE_NO
  #define IBUF_TREE_ROOT_PAGE_NO        FSP_IBUF_TREE_ROOT_PAGE_NO
-diff -ruN a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
---- a/storage/innobase/include/lock0lock.h     2011-01-21 19:52:38.967683738 +0900
-+++ b/storage/innobase/include/lock0lock.h     2011-01-21 19:54:44.660599140 +0900
-@@ -816,6 +816,7 @@
+--- a/storage/innobase/include/lock0lock.h
++++ b/storage/innobase/include/lock0lock.h
+@@ -817,6 +817,7 @@
  /** The lock system struct */
  struct lock_sys_struct{
        hash_table_t*   rec_hash;       /*!< hash table of the record locks */
@@ -242,10 +238,9 @@ diff -ruN a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock
  };
  
  /** The lock system */
-diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h       2011-01-21 19:53:42.380638228 +0900
-+++ b/storage/innobase/include/srv0srv.h       2011-01-21 19:54:44.662600032 +0900
-@@ -731,6 +731,11 @@
+--- a/storage/innobase/include/srv0srv.h
++++ b/storage/innobase/include/srv0srv.h
+@@ -742,6 +742,11 @@
  
  /** Status variables to be passed to MySQL */
  struct export_var_struct{
@@ -257,7 +252,7 @@ diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0sr
        ulint innodb_data_pending_reads;        /*!< Pending reads */
        ulint innodb_data_pending_writes;       /*!< Pending writes */
        ulint innodb_data_pending_fsyncs;       /*!< Pending fsyncs */
-@@ -748,6 +753,9 @@
+@@ -759,6 +764,9 @@
  #ifdef UNIV_DEBUG
        ulint innodb_buffer_pool_pages_latched; /*!< Latched pages */
  #endif /* UNIV_DEBUG */
@@ -267,8 +262,8 @@ diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0sr
        ulint innodb_buffer_pool_read_requests; /*!< buf_pool->stat.n_page_gets */
        ulint innodb_buffer_pool_reads;         /*!< srv_buf_pool_reads */
        ulint innodb_buffer_pool_wait_free;     /*!< srv_buf_pool_wait_free */
-@@ -756,13 +764,43 @@
-       ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */
+@@ -768,13 +776,43 @@
+       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*/
 +      ulint innodb_checkpoint_age;
@@ -311,7 +306,7 @@ diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0sr
        ulint innodb_os_log_written;            /*!< srv_os_log_written */
        ulint innodb_os_log_fsyncs;             /*!< fil_n_log_flushes */
        ulint innodb_os_log_pending_writes;     /*!< srv_os_log_pending_writes */
-@@ -771,6 +809,8 @@
+@@ -783,6 +821,8 @@
        ulint innodb_pages_created;             /*!< buf_pool->stat.n_pages_created */
        ulint innodb_pages_read;                /*!< buf_pool->stat.n_pages_read */
        ulint innodb_pages_written;             /*!< buf_pool->stat.n_pages_written */
@@ -320,7 +315,7 @@ diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0sr
        ulint innodb_row_lock_waits;            /*!< srv_n_lock_wait_count */
        ulint innodb_row_lock_current_waits;    /*!< srv_n_lock_wait_current_count */
        ib_int64_t innodb_row_lock_time;        /*!< srv_n_lock_wait_time
-@@ -780,11 +820,18 @@
+@@ -792,11 +832,18 @@
                                                / srv_n_lock_wait_count */
        ulint innodb_row_lock_time_max;         /*!< srv_n_lock_max_wait_time
                                                / 1000 */
@@ -339,10 +334,9 @@ diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0sr
  };
  
  /** Thread slot in the thread table */
-diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
---- a/storage/innobase/include/sync0sync.h     2011-01-21 19:48:45.982637372 +0900
-+++ b/storage/innobase/include/sync0sync.h     2011-01-21 19:54:44.664638235 +0900
-@@ -769,6 +769,10 @@
+--- a/storage/innobase/include/sync0sync.h
++++ b/storage/innobase/include/sync0sync.h
+@@ -766,6 +766,10 @@
  
  #define       SYNC_SPIN_ROUNDS        srv_n_spin_wait_rounds
  
@@ -353,10 +347,9 @@ diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync
  /** The number of mutex_exit calls. Intended for performance monitoring. */
  extern        ib_int64_t      mutex_exit_count;
  
-diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
---- a/storage/innobase/lock/lock0lock.c        2011-01-21 19:52:38.998600121 +0900
-+++ b/storage/innobase/lock/lock0lock.c        2011-01-21 19:54:44.668637536 +0900
-@@ -571,6 +571,7 @@
+--- a/storage/innobase/lock/lock0lock.c
++++ b/storage/innobase/lock/lock0lock.c
+@@ -569,6 +569,7 @@
        lock_sys = mem_alloc(sizeof(lock_sys_t));
  
        lock_sys->rec_hash = hash_create(n_cells);
@@ -364,7 +357,7 @@ diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.
  
        /* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
  
-@@ -1719,6 +1720,7 @@
+@@ -1729,6 +1730,7 @@
  
        HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
                    lock_rec_fold(space, page_no), lock);
@@ -372,7 +365,7 @@ diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.
        if (UNIV_UNLIKELY(type_mode & LOCK_WAIT)) {
  
                lock_set_lock_and_trx_wait(lock, trx);
-@@ -2265,6 +2267,7 @@
+@@ -2275,6 +2277,7 @@
  
        HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
                    lock_rec_fold(space, page_no), in_lock);
@@ -380,7 +373,7 @@ diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.
  
        UT_LIST_REMOVE(trx_locks, trx->trx_locks, in_lock);
  
-@@ -2308,6 +2311,7 @@
+@@ -2318,6 +2321,7 @@
  
        HASH_DELETE(lock_t, hash, lock_sys->rec_hash,
                    lock_rec_fold(space, page_no), in_lock);
@@ -388,10 +381,9 @@ diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.
  
        UT_LIST_REMOVE(trx_locks, trx->trx_locks, in_lock);
  }
-diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c   2011-01-21 19:53:42.390637840 +0900
-+++ b/storage/innobase/srv/srv0srv.c   2011-01-21 19:54:44.673637084 +0900
-@@ -2253,12 +2253,49 @@
+--- a/storage/innobase/srv/srv0srv.c
++++ b/storage/innobase/srv/srv0srv.c
+@@ -2262,12 +2262,49 @@
        ulint           LRU_len;
        ulint           free_len;
        ulint           flush_list_len;
@@ -441,7 +433,7 @@ diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
        export_vars.innodb_data_pending_reads
                = os_n_pending_reads;
        export_vars.innodb_data_pending_writes
-@@ -2295,6 +2332,92 @@
+@@ -2306,6 +2343,92 @@
  
        export_vars.innodb_buffer_pool_pages_misc
                = buf_pool_get_n_pages() - LRU_len - free_len;
@@ -534,9 +526,8 @@ diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
  #ifdef HAVE_ATOMIC_BUILTINS
        export_vars.innodb_have_atomic_builtins = 1;
  #else
-diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
---- a/storage/innobase/sync/sync0sync.c        2011-01-21 19:53:03.458637954 +0900
-+++ b/storage/innobase/sync/sync0sync.c        2011-01-21 19:54:44.676637686 +0900
+--- a/storage/innobase/sync/sync0sync.c
++++ b/storage/innobase/sync/sync0sync.c
 @@ -171,13 +171,13 @@
  
  /** The number of iterations in the mutex_spin_wait() spin loop.