packages (MYSQL_5_0): mysql/mysql-innodb_check_fragmentation.patch, mysql/m...
glen
glen at pld-linux.org
Thu Feb 24 14:50:50 CET 2011
Author: glen Date: Thu Feb 24 13:50:50 2011 GMT
Module: packages Tag: MYSQL_5_0
---- Log message:
- update percona patches using percona.sh
---- Files affected:
packages/mysql:
mysql-innodb_check_fragmentation.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_dict_size_limit.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_extra_rseg.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_fsync_source.patch (1.1.2.2 -> 1.1.2.3) , mysql-innodb_io_patches.patch (1.1.2.5 -> 1.1.2.6) , mysql-innodb_io_pattern.patch (1.1.2.4 -> 1.1.2.5) , mysql-innodb_locks_held.patch (1.1.2.5 -> 1.1.2.6) , mysql-innodb_misc_patch.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_recovery_patches.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_rw_lock.patch (1.1.2.5 -> 1.1.2.6) , mysql-innodb_show_bp.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_show_hashed_memory.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_split_buf_pool_mutex.patch (1.1.2.3 -> 1.1.2.4) , mysql-innodb_thread_concurrency_timer_based.patch (1.1.2.1 -> 1.1.2.2) , mysql-innodb_use_sys_malloc.patch (1.1.2.1 -> 1.1.2.2) , mysql-microsec_process.patch (1.1.2.3 -> 1.1.2.4) , mysql-microslow_innodb.patch (1.1.2.11 -> 1.1.2.12) , mysql-profiling_slow.patch (1.1.2.1 -> 1.1.2.2) , mysql-show_patches.patch (1.1.2.2 -> 1.1.2.3) , mysql-userstatv2.patch (1.1.2.13 -> 1.1.2.14)
---- Diffs:
================================================================
Index: packages/mysql/mysql-innodb_check_fragmentation.patch
diff -u packages/mysql/mysql-innodb_check_fragmentation.patch:1.1.2.1 packages/mysql/mysql-innodb_check_fragmentation.patch:1.1.2.2
--- packages/mysql/mysql-innodb_check_fragmentation.patch:1.1.2.1 Fri Jan 9 12:04:49 2009
+++ packages/mysql/mysql-innodb_check_fragmentation.patch Thu Feb 24 14:50:44 2011
@@ -1,4 +1,4 @@
-diff -r 936d427a9a15 innobase/btr/btr0cur.c
+diff -ruN a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
--- a/innobase/btr/btr0cur.c Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/btr/btr0cur.c Mon Dec 22 00:33:11 2008 -0800
@@ -516,6 +516,14 @@
@@ -16,20 +16,20 @@
break;
}
-@@ -663,6 +671,12 @@
- btr_cur_add_path_info(cursor, height,
+@@ -664,6 +672,12 @@
root_height);
}
-+
+
+ /* Initializes status counters */
+ innobase_mysql_thd_init_innodb_scan_cont();
+ innobase_mysql_thd_init_innodb_scan_jump();
+ innobase_mysql_thd_init_innodb_scan_data();
+ innobase_mysql_thd_init_innodb_scan_garbage();
-
++
break;
}
-diff -r 936d427a9a15 innobase/btr/btr0pcur.c
+
+diff -ruN a/innobase/btr/btr0pcur.c b/innobase/btr/btr0pcur.c
--- a/innobase/btr/btr0pcur.c Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/btr/btr0pcur.c Mon Dec 22 00:33:11 2008 -0800
@@ -381,6 +381,7 @@
@@ -40,7 +40,7 @@
ulint next_page_no;
ulint space;
page_t* page;
-@@ -393,11 +394,22 @@
+@@ -393,12 +394,23 @@
cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;
page = btr_pcur_get_page(cursor);
@@ -50,7 +50,7 @@
space = buf_frame_get_space_id(page);
ut_ad(next_page_no != FIL_NULL);
-+
+
+ if (next_page_no - page_no == 1) {
+ innobase_mysql_thd_increment_innodb_scan_cont(1);
+ } else {
@@ -60,9 +60,10 @@
+ page_get_data_size(page));
+ innobase_mysql_thd_increment_innodb_scan_garbage(
+ page_header_get_field(page, PAGE_GARBAGE));
-
++
next_page = btr_page_get(space, next_page_no, cursor->latch_mode, mtr);
ut_a(page_is_comp(next_page) == page_is_comp(page));
+ buf_block_align(next_page)->check_index_page_at_flush = TRUE;
@@ -427,6 +439,7 @@
record of the current page */
mtr_t* mtr) /* in: mtr */
@@ -71,7 +72,7 @@
ulint prev_page_no;
ulint space;
page_t* page;
-@@ -462,9 +475,20 @@
+@@ -462,10 +475,21 @@
btr_pcur_restore_position(latch_mode2, cursor, mtr);
page = btr_pcur_get_page(cursor);
@@ -79,7 +80,7 @@
prev_page_no = btr_page_get_prev(page, mtr);
space = buf_frame_get_space_id(page);
-+
+
+ if (page_no - prev_page_no == 1) {
+ innobase_mysql_thd_increment_innodb_scan_cont(1);
+ } else {
@@ -89,13 +90,14 @@
+ page_get_data_size(page));
+ innobase_mysql_thd_increment_innodb_scan_garbage(
+ page_header_get_field(page, PAGE_GARBAGE));
-
++
if (btr_pcur_is_before_first_on_page(cursor, mtr)
&& (prev_page_no != FIL_NULL)) {
-diff -r 936d427a9a15 innobase/btr/btr0sea.c
+
+diff -ruN a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c
--- a/innobase/btr/btr0sea.c Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/btr/btr0sea.c Mon Dec 22 00:33:11 2008 -0800
-@@ -861,6 +861,12 @@
+@@ -888,6 +888,12 @@
buf_pool->n_page_gets++;
@@ -108,7 +110,7 @@
return(TRUE);
/*-------------------------------------------*/
-diff -r 936d427a9a15 innobase/include/btr0cur.h
+diff -ruN a/innobase/include/btr0cur.h b/innobase/include/btr0cur.h
--- a/innobase/include/btr0cur.h Mon Dec 22 00:33:03 2008 -0800
+++ b/innobase/include/btr0cur.h Mon Dec 22 00:33:11 2008 -0800
@@ -697,6 +697,17 @@
@@ -129,7 +131,7 @@
#ifndef UNIV_NONINL
#include "btr0cur.ic"
#endif
-diff -r 936d427a9a15 patch_info/innodb_check_fragmentation.info
+diff -ruN /dev/null b/patch_info/innodb_check_fragmentation.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_check_fragmentation.info Mon Dec 22 00:33:11 2008 -0800
@@ -0,0 +1,6 @@
@@ -139,10 +141,10 @@
+Author=Percona <info at percona.com>
+License=GPL
+Comment=The names are Innodb_scan_*
-diff -r 936d427a9a15 sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Mon Dec 22 00:33:03 2008 -0800
+++ b/sql/ha_innodb.cc Mon Dec 22 00:33:11 2008 -0800
-@@ -760,6 +760,102 @@
+@@ -759,6 +759,102 @@
}
/*************************************************************************
@@ -245,10 +247,10 @@
Gets the InnoDB transaction handle for a MySQL handler object, creates
an InnoDB transaction struct if the corresponding MySQL thread struct still
lacks one. */
-diff -r 936d427a9a15 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Mon Dec 22 00:33:03 2008 -0800
+++ b/sql/mysqld.cc Mon Dec 22 00:33:11 2008 -0800
-@@ -6673,6 +6673,10 @@
+@@ -6777,6 +6777,10 @@
{"Handler_write", (char*) offsetof(STATUS_VAR, ha_write_count), SHOW_LONG_STATUS},
#ifdef HAVE_INNOBASE_DB
{"Innodb_", (char*) &innodb_status_variables, SHOW_VARS},
@@ -259,10 +261,10 @@
#endif /*HAVE_INNOBASE_DB*/
{"Key_blocks_not_flushed", (char*) &dflt_key_cache_var.global_blocks_changed, SHOW_KEY_CACHE_LONG},
{"Key_blocks_unused", (char*) &dflt_key_cache_var.blocks_unused, SHOW_KEY_CACHE_CONST_LONG},
-diff -r 936d427a9a15 sql/sql_class.h
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h Mon Dec 22 00:33:03 2008 -0800
+++ b/sql/sql_class.h Mon Dec 22 00:33:11 2008 -0800
-@@ -729,6 +729,10 @@
+@@ -694,6 +694,10 @@
sense to add to the /global/ status variable counter.
*/
double last_query_cost;
================================================================
Index: packages/mysql/mysql-innodb_dict_size_limit.patch
diff -u packages/mysql/mysql-innodb_dict_size_limit.patch:1.1.2.2 packages/mysql/mysql-innodb_dict_size_limit.patch:1.1.2.3
--- packages/mysql/mysql-innodb_dict_size_limit.patch:1.1.2.2 Tue Oct 27 11:04:57 2009
+++ packages/mysql/mysql-innodb_dict_size_limit.patch Thu Feb 24 14:50:44 2011
@@ -414,7 +414,7 @@
export_vars.innodb_buffer_pool_read_requests= buf_pool->n_page_gets;
export_vars.innodb_buffer_pool_write_requests= srv_buf_pool_write_requests;
export_vars.innodb_buffer_pool_wait_free= srv_buf_pool_wait_free;
-diff -ruN a/mysql-test/r/innodb_dict_size_limit.result b/mysql-test/r/innodb_dict_size_limit.result
+diff -ruN /dev/null b/mysql-test/r/innodb_dict_size_limit.result
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/mysql-test/r/innodb_dict_size_limit.result 2009-08-27 18:42:59.000000000 +0900
@@ -0,0 +1,60 @@
@@ -478,7 +478,7 @@
+DROP TABLE `test_3`;
+DROP TABLE `test_2`;
+DROP TABLE `test_1`;
-diff -ruN a/mysql-test/t/innodb_dict_size_limit.test b/mysql-test/t/innodb_dict_size_limit.test
+diff -ruN /dev/null b/mysql-test/t/innodb_dict_size_limit.test
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/mysql-test/t/innodb_dict_size_limit.test 2009-08-27 18:42:59.000000000 +0900
@@ -0,0 +1,63 @@
@@ -545,7 +545,7 @@
+DROP TABLE `test_2`;
+DROP TABLE `test_1`;
+
-diff -ruN a/patch_info/innodb_dict_size_limit.info b/patch_info/innodb_dict_size_limit.info
+diff -ruN /dev/null b/patch_info/innodb_dict_size_limit.info
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ b/patch_info/innodb_dict_size_limit.info 2009-08-27 18:42:59.000000000 +0900
@@ -0,0 +1,9 @@
@@ -561,7 +561,7 @@
diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc 2009-08-27 18:42:17.000000000 +0900
+++ b/sql/ha_innodb.cc 2009-08-27 18:42:59.000000000 +0900
-@@ -288,6 +288,8 @@
+@@ -306,6 +306,8 @@
(char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG},
{"dblwr_writes",
(char*) &export_vars.innodb_dblwr_writes, SHOW_LONG},
@@ -584,7 +584,7 @@
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2009-08-27 18:42:17.000000000 +0900
+++ b/sql/mysqld.cc 2009-08-27 18:42:59.000000000 +0900
-@@ -5101,6 +5101,7 @@
+@@ -5118,6 +5118,7 @@
OPT_INNODB_ADAPTIVE_CHECKPOINT,
OPT_INNODB_READ_IO_THREADS,
OPT_INNODB_WRITE_IO_THREADS,
@@ -592,7 +592,7 @@
OPT_INNODB_ADAPTIVE_HASH_INDEX,
OPT_FEDERATED,
OPT_INNODB_USE_LEGACY_CARDINALITY_ALGORITHM
-@@ -5464,6 +5465,10 @@
+@@ -5482,6 +5483,10 @@
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
@@ -606,7 +606,7 @@
diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc 2009-08-27 18:42:17.000000000 +0900
+++ b/sql/set_var.cc 2009-08-27 18:42:59.000000000 +0900
-@@ -540,6 +540,8 @@
+@@ -541,6 +541,8 @@
sys_var_enum sys_innodb_adaptive_checkpoint("innodb_adaptive_checkpoint",
&srv_adaptive_checkpoint,
&innodb_adaptive_checkpoint_typelib, fix_innodb_adaptive_checkpoint);
@@ -615,7 +615,7 @@
sys_var_long_ptr sys_innodb_show_locks_held(
"innodb_show_locks_held",
&srv_show_locks_held);
-@@ -930,6 +932,7 @@
+@@ -936,6 +938,7 @@
&sys_innodb_read_ahead,
&sys_innodb_enable_unsafe_group_commit,
&sys_innodb_adaptive_checkpoint,
@@ -623,7 +623,7 @@
&sys_innodb_show_locks_held,
&sys_innodb_show_verbose_locks,
&sys_innodb_io_pattern_trace,
-@@ -1084,6 +1087,7 @@
+@@ -1090,6 +1093,7 @@
{sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
================================================================
Index: packages/mysql/mysql-innodb_extra_rseg.patch
diff -u packages/mysql/mysql-innodb_extra_rseg.patch:1.1.2.1 packages/mysql/mysql-innodb_extra_rseg.patch:1.1.2.2
--- packages/mysql/mysql-innodb_extra_rseg.patch:1.1.2.1 Wed Aug 26 12:17:02 2009
+++ packages/mysql/mysql-innodb_extra_rseg.patch Thu Feb 24 14:50:44 2011
@@ -1,16 +1,16 @@
-diff -r 85e7025cf2d1 innobase/include/srv0srv.h
+diff -ruN a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
--- a/innobase/include/srv0srv.h Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/include/srv0srv.h Fri Jul 03 15:41:47 2009 -0700
-@@ -146,6 +146,8 @@
- extern ulint srv_enable_unsafe_group_commit;
+@@ -147,6 +147,8 @@
extern uint srv_read_ahead;
extern uint srv_adaptive_checkpoint;
-+
-+extern ulint srv_extra_rsegments;
++extern ulint srv_extra_rsegments;
++
extern ulint srv_dict_size_limit;
-diff -r 85e7025cf2d1 innobase/include/trx0sys.h
+ extern volatile ibool srv_io_pattern;
+diff -ruN a/innobase/include/trx0sys.h b/innobase/include/trx0sys.h
--- a/innobase/include/trx0sys.h Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/include/trx0sys.h Fri Jul 03 15:41:47 2009 -0700
@@ -105,6 +105,13 @@
@@ -27,19 +27,19 @@
/********************************************************************
Looks for a free slot for a rollback segment in the trx system file copy. */
-diff -r 85e7025cf2d1 innobase/srv/srv0srv.c
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/srv/srv0srv.c Fri Jul 03 15:41:47 2009 -0700
-@@ -352,6 +352,8 @@
-
+@@ -353,6 +353,8 @@
uint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
uint srv_adaptive_checkpoint = 0; /* 0: none 1: reflex 2: estimate */
-+
-+ulint srv_extra_rsegments = 0; /* extra rseg for users */
++ulint srv_extra_rsegments = 0; /* extra rseg for users */
++
ulint srv_dict_size_limit = 0;
-diff -r 85e7025cf2d1 innobase/srv/srv0start.c
+ volatile ibool srv_io_pattern = FALSE;
+diff -ruN a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c
--- a/innobase/srv/srv0start.c Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/srv/srv0start.c Fri Jul 03 15:41:47 2009 -0700
@@ -1418,6 +1418,8 @@
@@ -51,7 +51,7 @@
#ifdef UNIV_LOG_ARCHIVE
} else if (srv_archive_recovery) {
fprintf(stderr,
-diff -r 85e7025cf2d1 innobase/trx/trx0sys.c
+diff -ruN a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
--- a/innobase/trx/trx0sys.c Fri Jul 03 15:41:41 2009 -0700
+++ b/innobase/trx/trx0sys.c Fri Jul 03 15:41:47 2009 -0700
@@ -944,3 +944,28 @@
@@ -83,7 +83,7 @@
+ }
+ mtr_commit(&mtr);
+}
-diff -r 85e7025cf2d1 patch_info/innodb_extra_rseg.info
+diff -ruN /dev/null b/patch_info/innodb_extra_rseg.info
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patch_info/innodb_extra_rseg.info Fri Jul 03 15:41:47 2009 -0700
@@ -0,0 +1,6 @@
@@ -93,7 +93,7 @@
+Author=Percona <info at percona.com>
+License=GPL
+Comment
-diff -r 85e7025cf2d1 sql/ha_innodb.cc
+diff -ruN a/sql/ha_innodb.cc b/sql/ha_innodb.cc
--- a/sql/ha_innodb.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/ha_innodb.cc Fri Jul 03 15:41:47 2009 -0700
@@ -152,6 +152,7 @@
@@ -104,7 +104,7 @@
longlong innobase_buffer_pool_size, innobase_log_file_size;
/* The default values for the following char* start-up parameters
-@@ -1521,6 +1522,8 @@
+@@ -1506,6 +1507,8 @@
srv_n_read_io_threads = (ulint) innobase_read_io_threads;
srv_n_write_io_threads = (ulint) innobase_write_io_threads;
@@ -113,7 +113,7 @@
srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout;
srv_force_recovery = (ulint) innobase_force_recovery;
-diff -r 85e7025cf2d1 sql/ha_innodb.h
+diff -ruN a/sql/ha_innodb.h b/sql/ha_innodb.h
--- a/sql/ha_innodb.h Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/ha_innodb.h Fri Jul 03 15:41:47 2009 -0700
@@ -205,6 +205,7 @@
@@ -124,10 +124,10 @@
extern long innobase_force_recovery;
extern long innobase_open_files;
extern char *innobase_data_home_dir, *innobase_data_file_path;
-diff -r 85e7025cf2d1 sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/mysqld.cc Fri Jul 03 15:41:47 2009 -0700
-@@ -5101,6 +5101,7 @@
+@@ -5118,6 +5118,7 @@
OPT_INNODB_ADAPTIVE_CHECKPOINT,
OPT_INNODB_READ_IO_THREADS,
OPT_INNODB_WRITE_IO_THREADS,
@@ -135,7 +135,7 @@
OPT_INNODB_DICT_SIZE_LIMIT,
OPT_INNODB_ADAPTIVE_HASH_INDEX,
OPT_FEDERATED,
-@@ -5465,6 +5466,10 @@
+@@ -5483,6 +5484,10 @@
"Number of background write I/O threads in InnoDB.",
(gptr*) &innobase_write_io_threads, (gptr*) &innobase_write_io_threads,
0, GET_LONG, REQUIRED_ARG, 8, 1, 64, 0, 0, 0},
@@ -146,10 +146,10 @@
{"innodb_dict_size_limit", OPT_INNODB_DICT_SIZE_LIMIT,
"Limit the allocated memory for dictionary cache. (0: unlimited)",
(gptr*) &srv_dict_size_limit, (gptr*) &srv_dict_size_limit, 0,
-diff -r 85e7025cf2d1 sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/set_var.cc Fri Jul 03 15:41:47 2009 -0700
-@@ -1087,6 +1087,7 @@
+@@ -1093,6 +1093,7 @@
{sys_innodb_adaptive_checkpoint.name, (char*) &sys_innodb_adaptive_checkpoint, SHOW_SYS},
{"innodb_read_io_threads", (char*) &innobase_read_io_threads, SHOW_LONG},
{"innodb_write_io_threads", (char*) &innobase_write_io_threads, SHOW_LONG},
@@ -157,7 +157,7 @@
{sys_innodb_dict_size_limit.name, (char*) &sys_innodb_dict_size_limit, SHOW_SYS},
{sys_innodb_io_pattern_trace.name, (char*) &sys_innodb_io_pattern_trace, SHOW_SYS},
{sys_innodb_io_pattern_trace_running.name, (char*) &sys_innodb_io_pattern_trace_running, SHOW_SYS},
-diff -r 85e7025cf2d1 sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc Fri Jul 03 15:41:41 2009 -0700
+++ b/sql/sql_show.cc Fri Jul 03 15:41:47 2009 -0700
@@ -39,6 +39,8 @@
@@ -169,7 +169,7 @@
}
/* We need to undef it in InnoDB */
#undef byte
-@@ -4180,6 +4182,45 @@
+@@ -4186,6 +4188,45 @@
DBUG_RETURN(returnable);
}
@@ -215,12 +215,10 @@
/*
Find schema_tables elment by name
-@@ -4996,6 +5037,16 @@
- {"INDEX_NAME", 32, MYSQL_TYPE_STRING, 0, 0, "index name"},
- {"N_READ", 11, MYSQL_TYPE_LONG, 0, 0, "read ios"},
+@@ -5004,6 +5045,16 @@
{"N_WRITE", 11, MYSQL_TYPE_LONG, 0, 0, "write ios"},
-+ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
-+};
+ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
+ };
+
+ST_FIELD_INFO innodb_rseg_fields_info[]=
+{
@@ -229,10 +227,12 @@
+ {"PAGE_NO", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, ""},
+ {"MAX_SIZE", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, ""},
+ {"CURR_SIZE", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONG, 0, 0, ""},
- {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
- };
++ {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
++};
#endif
-@@ -5177,6 +5228,8 @@
+
+ ST_FIELD_INFO variables_fields_info[]=
+@@ -5183,6 +5234,8 @@
#ifdef HAVE_INNOBASE_DB
{"INNODB_IO_PATTERN", innodb_io_pattern_field_info, create_schema_table,
innodb_io_pattern_fill_table, 0, 0, -1, -1, 0},
================================================================
Index: packages/mysql/mysql-innodb_fsync_source.patch
diff -u packages/mysql/mysql-innodb_fsync_source.patch:1.1.2.2 packages/mysql/mysql-innodb_fsync_source.patch:1.1.2.3
--- packages/mysql/mysql-innodb_fsync_source.patch:1.1.2.2 Wed Aug 26 12:17:02 2009
+++ packages/mysql/mysql-innodb_fsync_source.patch Thu Feb 24 14:50:44 2011
@@ -1,4 +1,4 @@
-diff -r ef44d8017b6b innobase/buf/buf0flu.c
+diff -ruN a/innobase/buf/buf0flu.c b/innobase/buf/buf0flu.c
--- a/innobase/buf/buf0flu.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/buf/buf0flu.c Fri Jul 03 15:41:32 2009 -0700
@@ -341,7 +341,7 @@
@@ -29,7 +29,7 @@
#endif
buf_flush_init_for_writing(block->frame, block->newest_modification,
block->space, block->offset);
-diff -r ef44d8017b6b innobase/fil/fil0fil.c
+diff -ruN a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
--- a/innobase/fil/fil0fil.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/fil/fil0fil.c Fri Jul 03 15:41:32 2009 -0700
@@ -245,6 +245,7 @@
@@ -61,13 +61,10 @@
return(system);
}
-@@ -1437,6 +1441,23 @@
- }
+@@ -1440,6 +1444,23 @@
+ }
- mutex_exit(&(system->mutex));
-+}
-+
-+/********************************************************************
+ /********************************************************************
+Prints internal counters */
+
+void
@@ -82,9 +79,12 @@
+ fil_system->flush_types[FLUSH_FROM_LOG_IO_COMPLETE],
+ fil_system->flush_types[FLUSH_FROM_LOG_WRITE_UP_TO],
+ fil_system->flush_types[FLUSH_FROM_ARCHIVE]);
- }
-
- /********************************************************************
++}
++
++/********************************************************************
+ Initializes the ibuf data structure for space 0 == the system tablespace.
+ This can be called after the file space headers have been created and the
+ dictionary system has been initialized. */
@@ -2256,7 +2277,7 @@
os_thread_sleep(20000);
@@ -142,7 +142,7 @@
}
mem_free(space_ids);
-diff -r ef44d8017b6b innobase/include/fil0fil.h
+diff -ruN a/innobase/include/fil0fil.h b/innobase/include/fil0fil.h
--- a/innobase/include/fil0fil.h Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/include/fil0fil.h Fri Jul 03 15:41:32 2009 -0700
@@ -197,6 +197,13 @@
@@ -197,7 +197,7 @@
/**********************************************************************
Checks the consistency of the tablespace cache. */
-diff -r ef44d8017b6b innobase/include/log0log.h
+diff -ruN a/innobase/include/log0log.h b/innobase/include/log0log.h
--- a/innobase/include/log0log.h Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/include/log0log.h Fri Jul 03 15:41:32 2009 -0700
@@ -146,6 +146,22 @@
@@ -223,7 +223,7 @@
/**********************************************************
This function is called, e.g., when a transaction wants to commit. It checks
that the log has been written to the log file up to the last log entry written
-@@ -159,14 +175,21 @@
+@@ -159,9 +175,9 @@
be written, ut_dulint_max if not specified */
ulint wait, /* in: LOG_NO_WAIT, LOG_WAIT_ONE_GROUP,
or LOG_WAIT_ALL_GROUPS */
@@ -236,8 +236,10 @@
/********************************************************************
Does a syncronous flush of the log buffer to disk. */
+@@ -174,6 +190,13 @@
+
void
- log_buffer_flush_to_disk(void);
+ log_buffer_flush_maybe_sync(void);
+/*==========================*/
+/********************************************************************
+Flushes the log buffer. Forces it to disk depending on the value of
@@ -245,9 +247,9 @@
+
+void
+log_buffer_flush_maybe_sync(void);
- /*==========================*/
+ /*=============================*/
/********************************************************************
- Flushes the log buffer. Forces it to disk depending on the value of
+ Advances the smallest lsn for which there are unflushed dirty blocks in the
@@ -751,6 +774,12 @@
AND flushed to disk */
ulint n_pending_writes;/* number of currently pending flushes
@@ -261,7 +263,7 @@
/* NOTE on the 'flush' in names of the fields below: starting from
4.0.14, we separate the write of the log file and the actual fsync()
or other method to flush it to disk. The names below shhould really
-diff -r ef44d8017b6b innobase/log/log0log.c
+diff -ruN a/innobase/log/log0log.c b/innobase/log/log0log.c
--- a/innobase/log/log0log.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/log/log0log.c Fri Jul 03 15:41:32 2009 -0700
@@ -782,6 +782,15 @@
@@ -419,7 +421,7 @@
fil_close_all_files();
-@@ -3363,15 +3381,45 @@
+@@ -3363,16 +3381,46 @@
time_elapsed = 0.001 + difftime(current_time,
log_sys->last_printout_time);
fprintf(file,
@@ -440,7 +442,7 @@
log_sys->n_log_ios_old = log_sys->n_log_ios;
log_sys->last_printout_time = current_time;
-+
+
+ fprintf(file,
+ "log sync callers: %lu buffer pool, background %lu sync and %lu async, "
+ "%lu internal, checkpoint %lu sync and %lu async, %lu archive, "
@@ -468,10 +470,11 @@
+ log_sys->log_sync_syncers[LOG_WRITE_FROM_LOG_ARCHIVE],
+ log_sys->log_sync_syncers[LOG_WRITE_FROM_COMMIT_SYNC],
+ log_sys->log_sync_syncers[LOG_WRITE_FROM_COMMIT_ASYNC]);
-
++
mutex_exit(&(log_sys->mutex));
}
-diff -r ef44d8017b6b innobase/srv/srv0srv.c
+
+diff -ruN a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
--- a/innobase/srv/srv0srv.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/srv/srv0srv.c Fri Jul 03 15:41:32 2009 -0700
@@ -1698,6 +1698,12 @@
@@ -487,7 +490,7 @@
"SEMAPHORES\n"
"----------\n", file);
sync_print(file);
-diff -r ef44d8017b6b innobase/trx/trx0sys.c
+diff -ruN a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
--- a/innobase/trx/trx0sys.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/trx/trx0sys.c Fri Jul 03 15:41:32 2009 -0700
@@ -511,7 +511,7 @@
@@ -499,7 +502,7 @@
leave_func:
ut_free(unaligned_read_buf);
-diff -r ef44d8017b6b innobase/trx/trx0trx.c
+diff -ruN a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
--- a/innobase/trx/trx0trx.c Fri Jul 03 15:41:25 2009 -0700
+++ b/innobase/trx/trx0trx.c Fri Jul 03 15:41:32 2009 -0700
@@ -942,19 +942,21 @@
@@ -553,7 +556,7 @@
} else {
ut_error;
}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_check_fragmentation.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_dict_size_limit.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_extra_rseg.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_fsync_source.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_io_patches.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_io_pattern.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_locks_held.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_misc_patch.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_recovery_patches.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_rw_lock.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_bp.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_show_hashed_memory.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_split_buf_pool_mutex.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_thread_concurrency_timer_based.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-innodb_use_sys_malloc.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-microsec_process.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-microslow_innodb.patch?r1=1.1.2.11&r2=1.1.2.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-profiling_slow.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-show_patches.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-userstatv2.patch?r1=1.1.2.13&r2=1.1.2.14&f=u
More information about the pld-cvs-commit
mailing list