packages: mysql/control_online_alter_index.patch, mysql/innodb_adaptive_has...
arekm
arekm at pld-linux.org
Thu Mar 31 18:54:22 CEST 2011
Author: arekm Date: Thu Mar 31 16:54:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.5.10
---- Files affected:
packages/mysql:
control_online_alter_index.patch (1.2 -> 1.3) , innodb_adaptive_hash_index_partitions.patch (1.3 -> 1.4) , innodb_admin_command_base.patch (1.2 -> 1.3) , innodb_buffer_pool_pages_i_s.patch (1.3 -> 1.4) , innodb_buffer_pool_shm.patch (1.3 -> 1.4) , innodb_deadlock_count.patch (1.3 -> 1.4) , innodb_dict_size_limit.patch (1.2 -> 1.3) , innodb_expand_import.patch (1.3 -> 1.4) , innodb_extend_slow.patch (1.2 -> 1.3) , innodb_extra_rseg.patch (1.2 -> 1.3) , innodb_fast_checksum.patch (1.3 -> 1.4) , innodb_files_extend.patch (1.3 -> 1.4) , innodb_fix_misc.patch (1.3 -> 1.4) , innodb_io_patches.patch (1.2 -> 1.3) , innodb_lru_dump_restore.patch (1.3 -> 1.4) , innodb_opt_lru_count.patch (1.2 -> 1.3) , innodb_overwrite_relay_log_info.patch (1.3 -> 1.4) , innodb_pass_corrupt_table.patch (1.3 -> 1.4) , innodb_recovery_patches.patch (1.3 -> 1.4) , innodb_separate_doublewrite.patch (1.3 -> 1.4) , innodb_show_lock_name.patch (1.2 -> 1.3) , innodb_show_status.patch (1.2 -> 1.3) , innodb_show_status_extend.patch (1.3 -> 1.4) , innodb_show_sys_tables.patch (1.2 -> 1.3) , innodb_split_buf_pool_mutex.patch (1.2 -> 1.3) , innodb_stats.patch (1.3 -> 1.4) , innodb_thread_concurrency_timer_based.patch (1.2 -> 1.3) , log_connection_error.patch (1.2 -> 1.3) , log_warnings_suppress.patch (1.1 -> 1.2) , microsec_process.patch (1.2 -> 1.3) , mysql.spec (1.544 -> 1.545) , mysql_remove_eol_carret.patch (1.1 -> 1.2) , mysql_syslog.patch (1.2 -> 1.3) , optimizer_fix.patch (1.2 -> 1.3) , query_cache_enhance.patch (1.3 -> 1.4) , response_time_distribution.patch (1.2 -> 1.3) , show_slave_status_nolock.patch (1.2 -> 1.3) , show_temp.patch (1.2 -> 1.3) , slow_extended.patch (1.3 -> 1.4) , sql_no_fcache.patch (1.2 -> 1.3) , userstat.patch (1.3 -> 1.4) , processlist_row_stats.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mysql/control_online_alter_index.patch
diff -u packages/mysql/control_online_alter_index.patch:1.2 packages/mysql/control_online_alter_index.patch:1.3
--- packages/mysql/control_online_alter_index.patch:1.2 Sat Feb 19 23:16:59 2011
+++ packages/mysql/control_online_alter_index.patch Thu Mar 31 18:54:15 2011
@@ -8,23 +8,12 @@
diff -ruN a/sql/handler.h b/sql/handler.h
--- a/sql/handler.h 2010-11-03 07:01:14.000000000 +0900
+++ b/sql/handler.h 2010-12-03 13:51:04.727293058 +0900
-@@ -194,6 +194,19 @@
- #define HA_ONLINE_DROP_UNIQUE_INDEX (1L << 9) /*drop uniq. online*/
- #define HA_ONLINE_ADD_PK_INDEX (1L << 10)/*add prim. online*/
- #define HA_ONLINE_DROP_PK_INDEX (1L << 11)/*drop prim. online*/
+@@ -197,6 +197,8 @@
+ #define HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE (1L << 9)
+ #define HA_INPLACE_ADD_PK_INDEX_NO_WRITE (1L << 10)
+ #define HA_INPLACE_DROP_PK_INDEX_NO_WRITE (1L << 11)
+
-+#define HA_ONLINE_ALTER_INDEX_MASK (HA_ONLINE_ADD_INDEX_NO_WRITES \
-+ | HA_ONLINE_DROP_INDEX_NO_WRITES \
-+ | HA_ONLINE_ADD_UNIQUE_INDEX_NO_WRITES \
-+ | HA_ONLINE_DROP_UNIQUE_INDEX_NO_WRITES \
-+ | HA_ONLINE_ADD_PK_INDEX_NO_WRITES \
-+ | HA_ONLINE_DROP_PK_INDEX_NO_WRITES \
-+ | HA_ONLINE_ADD_INDEX \
-+ | HA_ONLINE_DROP_INDEX \
-+ | HA_ONLINE_ADD_UNIQUE_INDEX \
-+ | HA_ONLINE_DROP_UNIQUE_INDEX \
-+ | HA_ONLINE_ADD_PK_INDEX \
-+ | HA_ONLINE_DROP_PK_INDEX)
++#define HA_INPLACE_ALTER_INDEX_MASK ((1L << 12) - 1)
/*
HA_PARTITION_FUNCTION_SUPPORTED indicates that the function is
supported at all.
@@ -51,7 +40,7 @@
+ flags= new_table->file->alter_table_flags(alter_info->flags);
+ if (!thd->variables.online_alter_index)
+ {
-+ flags&= ~((uint)HA_ONLINE_ALTER_INDEX_MASK);
++ flags&= ~((uint)HA_INPLACE_ALTER_INDEX_MASK);
+ }
+ if (!flags)
{
@@ -66,7 +55,7 @@
alter_flags= table->file->alter_table_flags(alter_info->flags);
+ if (!thd->variables.online_alter_index)
+ {
-+ alter_flags&= ~((ulong)HA_ONLINE_ALTER_INDEX_MASK);
++ alter_flags&= ~((ulong)HA_INPLACE_ALTER_INDEX_MASK);
+ }
DBUG_PRINT("info", ("alter_flags: %lu", alter_flags));
/* Check dropped indexes. */
================================================================
Index: packages/mysql/innodb_adaptive_hash_index_partitions.patch
diff -u packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.3 packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.4
--- packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.3 Thu Mar 10 19:02:59 2011
+++ packages/mysql/innodb_adaptive_hash_index_partitions.patch Thu Mar 31 18:54:15 2011
@@ -83,7 +83,7 @@
diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
--- a/storage/innobase/btr/btr0cur.c 2010-12-04 15:52:23.359513820 +0900
+++ b/storage/innobase/btr/btr0cur.c 2010-12-04 16:12:48.643551837 +0900
-@@ -486,7 +486,7 @@
+@@ -498,7 +498,7 @@
#ifdef UNIV_SEARCH_PERF_STAT
info->n_searches++;
#endif
@@ -92,7 +92,7 @@
&& latch_mode <= BTR_MODIFY_LEAF
&& info->last_hash_succ
&& !estimate
-@@ -522,7 +522,7 @@
+@@ -534,7 +534,7 @@
if (has_search_latch) {
/* Release possible search latch to obey latching order */
@@ -101,7 +101,7 @@
}
/* Store the position of the tree latch we push to mtr so that we
-@@ -844,7 +844,7 @@
+@@ -856,7 +856,7 @@
if (has_search_latch) {
@@ -110,7 +110,7 @@
}
}
-@@ -2060,7 +2060,7 @@
+@@ -1971,7 +1971,7 @@
btr_search_update_hash_on_delete(cursor);
}
@@ -119,7 +119,7 @@
}
if (!(flags & BTR_KEEP_SYS_FLAG)) {
-@@ -2074,7 +2074,7 @@
+@@ -1985,7 +1985,7 @@
row_upd_rec_in_place(rec, index, offsets, update, page_zip);
if (block->is_hashed) {
@@ -128,7 +128,7 @@
}
if (page_zip && !dict_index_is_clust(index)
-@@ -2852,7 +2852,7 @@
+@@ -2763,7 +2763,7 @@
}
if (block->is_hashed) {
@@ -137,7 +137,7 @@
}
page_zip = buf_block_get_page_zip(block);
-@@ -2867,7 +2867,7 @@
+@@ -2778,7 +2778,7 @@
}
if (block->is_hashed) {
@@ -146,7 +146,7 @@
}
btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx,
-@@ -2994,13 +2994,13 @@
+@@ -2905,13 +2905,13 @@
== dict_table_is_comp(cursor->index->table));
if (block->is_hashed) {
@@ -211,7 +211,7 @@
@@ -153,7 +158,7 @@
if (heap->free_block == NULL) {
- buf_block_t* block = buf_block_alloc(NULL, 0);
+ buf_block_t* block = buf_block_alloc(NULL);
- rw_lock_x_lock(&btr_search_latch);
+ rw_lock_x_lock(btr_search_get_latch(key));
@@ -1006,7 +1006,7 @@
#endif /* UNIV_SYNC_DEBUG */
ut_ad(!btr_search_enabled);
-@@ -2635,6 +2640,7 @@
+@@ -2636,6 +2641,7 @@
{
block->check_index_page_at_flush = FALSE;
block->index = NULL;
@@ -1017,7 +1017,7 @@
diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
--- a/storage/innobase/buf/buf0lru.c 2010-12-04 15:35:29.137347521 +0900
+++ b/storage/innobase/buf/buf0lru.c 2010-12-04 16:12:48.658550840 +0900
-@@ -1810,7 +1810,7 @@
+@@ -1776,7 +1776,7 @@
UNIV_MEM_VALID(((buf_block_t*) bpage)->frame,
UNIV_PAGE_SIZE);
@@ -1029,7 +1029,7 @@
diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
--- a/storage/innobase/dict/dict0dict.c 2010-12-04 15:52:23.398513916 +0900
+++ b/storage/innobase/dict/dict0dict.c 2010-12-04 16:12:48.662550715 +0900
-@@ -1806,7 +1806,7 @@
+@@ -1812,7 +1812,7 @@
zero. */
for (;;) {
@@ -1054,7 +1054,7 @@
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:12:20.185850734 +0900
+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:12:48.674552412 +0900
-@@ -11617,6 +11617,11 @@
+@@ -11671,6 +11671,11 @@
"Disable with --skip-innodb-adaptive-hash-index.",
NULL, innodb_adaptive_hash_index_update, TRUE);
@@ -1066,14 +1066,14 @@
static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
PLUGIN_VAR_RQCMDARG,
"Replication thread delay (ms) on the slave server if "
-@@ -11981,6 +11986,7 @@
+@@ -12041,6 +12046,7 @@
MYSQL_SYSVAR(use_sys_stats_table),
MYSQL_SYSVAR(stats_sample_pages),
MYSQL_SYSVAR(adaptive_hash_index),
+ MYSQL_SYSVAR(adaptive_hash_index_partitions),
+ MYSQL_SYSVAR(stats_method),
MYSQL_SYSVAR(replication_delay),
MYSQL_SYSVAR(status_file),
- MYSQL_SYSVAR(strict_mode),
diff -ruN a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
--- a/storage/innobase/include/btr0sea.h 2010-12-03 15:48:03.070987226 +0900
+++ b/storage/innobase/include/btr0sea.h 2010-12-04 16:12:48.707551382 +0900
@@ -1318,7 +1318,7 @@
@@ -4445,7 +4445,7 @@
#ifndef UNIV_HOTBACKUP
- temp_block = buf_block_alloc(buf_pool, 0);
+ temp_block = buf_block_alloc(buf_pool);
- btr_search_drop_page_hash_index(block);
+ btr_search_drop_page_hash_index(block, index);
block->check_index_page_at_flush = TRUE;
@@ -1469,7 +1469,7 @@
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
--- a/storage/innobase/srv/srv0srv.c 2010-12-04 16:12:20.231484679 +0900
+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 16:12:48.726551018 +0900
-@@ -2044,7 +2044,9 @@
+@@ -2048,7 +2048,9 @@
"-------------------------------------\n", file);
ibuf_print(file);
@@ -1480,7 +1480,7 @@
fprintf(file,
"%.2f hash searches/s, %.2f non-hash searches/s\n",
-@@ -2069,14 +2071,15 @@
+@@ -2073,14 +2075,15 @@
ut_total_allocated_memory,
mem_pool_get_reserved(mem_comm_pool));
/* Calcurate reserved memories */
@@ -1500,7 +1500,7 @@
lock_sys_subtotal = 0;
if (trx_sys) {
-@@ -2103,10 +2106,10 @@
+@@ -2107,10 +2110,10 @@
" Threads %lu \t(%lu + %lu)\n",
(ulong) (btr_search_sys
@@ -1516,7 +1516,7 @@
diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
--- a/storage/innobase/sync/sync0sync.c 2010-12-03 17:36:44.300986571 +0900
+++ b/storage/innobase/sync/sync0sync.c 2010-12-04 16:12:48.729513564 +0900
-@@ -1184,7 +1184,6 @@
+@@ -1177,7 +1177,6 @@
case SYNC_OUTER_ANY_LATCH:
case SYNC_FILE_FORMAT_TAG:
case SYNC_DOUBLEWRITE:
@@ -1524,7 +1524,7 @@
case SYNC_SEARCH_SYS_CONF:
case SYNC_TRX_LOCK_HEAP:
case SYNC_KERNEL:
-@@ -1205,6 +1204,7 @@
+@@ -1198,6 +1197,7 @@
ut_error;
}
break;
================================================================
Index: packages/mysql/innodb_admin_command_base.patch
diff -u packages/mysql/innodb_admin_command_base.patch:1.2 packages/mysql/innodb_admin_command_base.patch:1.3
--- packages/mysql/innodb_admin_command_base.patch:1.2 Sat Feb 19 23:16:59 2011
+++ packages/mysql/innodb_admin_command_base.patch Thu Mar 31 18:54:15 2011
@@ -8,7 +8,7 @@
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:32:15.624039043 +0900
+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:32:35.424957827 +0900
-@@ -11772,7 +11772,8 @@
+@@ -11833,7 +11833,8 @@
i_s_innodb_sys_foreign_cols,
i_s_innodb_sys_stats,
i_s_innodb_table_stats,
================================================================
Index: packages/mysql/innodb_buffer_pool_pages_i_s.patch
diff -u packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.3 packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.4
--- packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.3 Thu Mar 10 19:02:59 2011
+++ packages/mysql/innodb_buffer_pool_pages_i_s.patch Thu Mar 31 18:54:15 2011
@@ -48,7 +48,7 @@
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 20:20:44.614551139 +0900
+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-06 19:23:47.622195800 +0900
-@@ -12060,6 +12060,9 @@
+@@ -12121,6 +12121,9 @@
i_s_innodb_sys_stats,
i_s_innodb_table_stats,
i_s_innodb_index_stats,
================================================================
Index: packages/mysql/innodb_buffer_pool_shm.patch
diff -u packages/mysql/innodb_buffer_pool_shm.patch:1.3 packages/mysql/innodb_buffer_pool_shm.patch:1.4
--- packages/mysql/innodb_buffer_pool_shm.patch:1.3 Thu Mar 10 19:02:59 2011
+++ packages/mysql/innodb_buffer_pool_shm.patch Thu Mar 31 18:54:15 2011
@@ -742,7 +742,7 @@
static char* internal_innobase_data_file_path = NULL;
-@@ -2624,6 +2625,14 @@
+@@ -2643,6 +2644,14 @@
srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
srv_buf_pool_instances = (ulint) innobase_buffer_pool_instances;
@@ -757,7 +757,7 @@
srv_mem_pool_size = (ulint) innobase_additional_mem_pool_size;
srv_n_file_io_threads = (ulint) innobase_file_io_threads;
-@@ -2640,6 +2649,7 @@
+@@ -2659,6 +2668,7 @@
srv_use_doublewrite_buf = (ibool) innobase_use_doublewrite;
srv_use_checksums = (ibool) innobase_use_checksums;
srv_fast_checksum = (ibool) innobase_fast_checksum;
@@ -765,7 +765,7 @@
#ifdef HAVE_LARGE_PAGES
if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11648,6 +11658,16 @@
+@@ -11702,6 +11712,16 @@
"Number of buffer pool instances, set to higher value on high-end machines to increase scalability",
NULL, NULL, 1L, 1L, MAX_BUFFER_POOLS, 1L);
@@ -782,7 +782,7 @@
static MYSQL_SYSVAR_ULONG(commit_concurrency, innobase_commit_concurrency,
PLUGIN_VAR_RQCMDARG,
"Helps in performance tuning in heavily concurrent environments.",
-@@ -11939,6 +11959,8 @@
+@@ -12000,6 +12020,8 @@
MYSQL_SYSVAR(autoextend_increment),
MYSQL_SYSVAR(buffer_pool_size),
MYSQL_SYSVAR(buffer_pool_instances),
@@ -1219,7 +1219,7 @@
diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
--- a/storage/innobase/srv/srv0start.c 2010-12-04 20:19:29.806482628 +0900
+++ b/storage/innobase/srv/srv0start.c 2010-12-07 16:10:14.964785346 +0900
-@@ -1835,6 +1835,8 @@
+@@ -1838,6 +1838,8 @@
Note that this is not as heavy weight as it seems. At
this point there will be only ONE page in the buf_LRU
and there must be no page in the buf_flush list. */
================================================================
Index: packages/mysql/innodb_deadlock_count.patch
diff -u packages/mysql/innodb_deadlock_count.patch:1.3 packages/mysql/innodb_deadlock_count.patch:1.4
--- packages/mysql/innodb_deadlock_count.patch:1.3 Thu Mar 10 19:02:59 2011
+++ packages/mysql/innodb_deadlock_count.patch Thu Mar 31 18:54:15 2011
@@ -8,7 +8,7 @@
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:09:53.145500265 +0900
+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:10:24.605515894 +0900
-@@ -668,6 +668,8 @@
+@@ -687,6 +687,8 @@
(char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG},
{"dblwr_writes",
(char*) &export_vars.innodb_dblwr_writes, SHOW_LONG},
@@ -31,7 +31,7 @@
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
--- a/storage/innobase/include/srv0srv.h 2010-12-04 15:55:21.378480843 +0900
+++ b/storage/innobase/include/srv0srv.h 2010-12-04 16:10:24.606550983 +0900
-@@ -760,6 +760,7 @@
+@@ -774,6 +774,7 @@
ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/
ulint innodb_dblwr_pages_written; /*!< srv_dblwr_pages_written */
ulint innodb_dblwr_writes; /*!< srv_dblwr_writes */
@@ -53,7 +53,7 @@
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
--- a/storage/innobase/srv/srv0srv.c 2010-12-04 15:57:13.069513371 +0900
+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 16:10:24.610593039 +0900
-@@ -469,6 +469,7 @@
+@@ -473,6 +473,7 @@
static ulint srv_n_rows_deleted_old = 0;
static ulint srv_n_rows_read_old = 0;
@@ -61,7 +61,7 @@
UNIV_INTERN ulint srv_n_lock_wait_count = 0;
UNIV_INTERN ulint srv_n_lock_wait_current_count = 0;
UNIV_INTERN ib_int64_t srv_n_lock_wait_time = 0;
-@@ -2287,6 +2288,7 @@
+@@ -2291,6 +2292,7 @@
export_vars.innodb_buffer_pool_pages_data = LRU_len;
export_vars.innodb_buffer_pool_pages_dirty = flush_list_len;
export_vars.innodb_buffer_pool_pages_free = free_len;
================================================================
Index: packages/mysql/innodb_dict_size_limit.patch
diff -u packages/mysql/innodb_dict_size_limit.patch:1.2 packages/mysql/innodb_dict_size_limit.patch:1.3
--- packages/mysql/innodb_dict_size_limit.patch:1.2 Sat Feb 19 23:16:59 2011
+++ packages/mysql/innodb_dict_size_limit.patch Thu Mar 31 18:54:15 2011
@@ -360,7 +360,7 @@
/****************************************************************//**
If the given column name is reserved for InnoDB system columns, return
TRUE.
-@@ -1723,6 +1785,11 @@
+@@ -1729,6 +1791,11 @@
ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
ut_ad(mutex_own(&(dict_sys->mutex)));
@@ -375,7 +375,7 @@
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:43:57.294986852 +0900
+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:45:47.534959966 +0900
-@@ -656,6 +656,8 @@
+@@ -675,6 +675,8 @@
(char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG},
{"dblwr_writes",
(char*) &export_vars.innodb_dblwr_writes, SHOW_LONG},
@@ -384,7 +384,7 @@
{"have_atomic_builtins",
(char*) &export_vars.innodb_have_atomic_builtins, SHOW_BOOL},
{"log_waits",
-@@ -11536,6 +11538,11 @@
+@@ -11616,6 +11618,11 @@
"Number of extra user rollback segments which are used in a round-robin fashion.",
NULL, NULL, 127, 0, 127, 0);
@@ -396,7 +396,7 @@
static struct st_mysql_sys_var* innobase_system_variables[]= {
MYSQL_SYSVAR(additional_mem_pool_size),
MYSQL_SYSVAR(autoextend_increment),
-@@ -11603,6 +11610,7 @@
+@@ -11684,6 +11691,7 @@
MYSQL_SYSVAR(read_ahead),
MYSQL_SYSVAR(adaptive_flushing_method),
MYSQL_SYSVAR(extra_rsegments),
@@ -500,7 +500,7 @@
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
--- a/storage/innobase/include/srv0srv.h 2010-12-03 15:43:57.297067100 +0900
+++ b/storage/innobase/include/srv0srv.h 2010-12-03 15:45:47.562024404 +0900
-@@ -228,7 +228,7 @@
+@@ -233,7 +233,7 @@
extern ulint srv_adaptive_flushing_method;
extern ulint srv_extra_rsegments;
@@ -509,7 +509,7 @@
/*-------------------------------------------*/
extern ulint srv_n_rows_inserted;
-@@ -708,6 +708,7 @@
+@@ -726,6 +726,7 @@
ulint innodb_data_writes; /*!< I/O write requests */
ulint innodb_data_written; /*!< Data bytes written */
ulint innodb_data_reads; /*!< I/O read requests */
@@ -520,7 +520,7 @@
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
--- a/storage/innobase/srv/srv0srv.c 2010-12-03 15:43:57.301024390 +0900
+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 15:45:47.565023830 +0900
-@@ -416,6 +416,7 @@
+@@ -421,6 +421,7 @@
UNIV_INTERN ulint srv_adaptive_flushing_method = 0; /* 0: native 1: estimate 2: keep_average */
UNIV_INTERN ulint srv_extra_rsegments = 127; /* extra rseg for users */
@@ -528,7 +528,7 @@
/*-------------------------------------------*/
UNIV_INTERN ulong srv_n_spin_wait_rounds = 30;
UNIV_INTERN ulong srv_n_free_tickets_to_enter = 500;
-@@ -2226,6 +2227,7 @@
+@@ -2231,6 +2232,7 @@
export_vars.innodb_data_reads = os_n_file_reads;
export_vars.innodb_data_writes = os_n_file_writes;
export_vars.innodb_data_written = srv_data_written;
================================================================
Index: packages/mysql/innodb_expand_import.patch
diff -u packages/mysql/innodb_expand_import.patch:1.3 packages/mysql/innodb_expand_import.patch:1.4
--- packages/mysql/innodb_expand_import.patch:1.3 Thu Mar 10 19:02:59 2011
+++ packages/mysql/innodb_expand_import.patch Thu Mar 31 18:54:15 2011
@@ -500,7 +500,7 @@
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:49:59.195023983 +0900
+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:52:23.555957062 +0900
-@@ -7337,6 +7337,14 @@
+@@ -7356,6 +7356,14 @@
err = row_discard_tablespace_for_mysql(dict_table->name, trx);
} else {
err = row_import_tablespace_for_mysql(dict_table->name, trx);
@@ -515,7 +515,7 @@
}
err = convert_error_code_to_mysql(err, dict_table->flags, NULL);
-@@ -11538,6 +11546,11 @@
+@@ -11618,6 +11626,11 @@
"Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
@@ -527,7 +527,7 @@
static MYSQL_SYSVAR_ULONG(extra_rsegments, srv_extra_rsegments,
PLUGIN_VAR_RQCMDARG,
"Number of extra user rollback segments which are used in a round-robin fashion.",
-@@ -11614,6 +11627,7 @@
+@@ -11695,6 +11708,7 @@
MYSQL_SYSVAR(flush_neighbor_pages),
MYSQL_SYSVAR(read_ahead),
MYSQL_SYSVAR(adaptive_flushing_method),
@@ -538,7 +538,7 @@
diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
--- a/storage/innobase/include/srv0srv.h 2010-12-03 15:48:03.077954270 +0900
+++ b/storage/innobase/include/srv0srv.h 2010-12-03 15:52:23.561986996 +0900
-@@ -227,6 +227,8 @@
+@@ -232,6 +232,8 @@
extern ulint srv_read_ahead;
extern ulint srv_adaptive_flushing_method;
@@ -550,7 +550,7 @@
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
--- a/storage/innobase/srv/srv0srv.c 2010-12-03 15:49:59.230956118 +0900
+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 15:52:23.562954411 +0900
-@@ -415,6 +415,8 @@
+@@ -420,6 +420,8 @@
UNIV_INTERN ulint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
UNIV_INTERN ulint srv_adaptive_flushing_method = 0; /* 0: native 1: estimate 2: keep_average */
================================================================
Index: packages/mysql/innodb_extend_slow.patch
diff -u packages/mysql/innodb_extend_slow.patch:1.2 packages/mysql/innodb_extend_slow.patch:1.3
--- packages/mysql/innodb_extend_slow.patch:1.2 Sat Feb 19 23:16:59 2011
+++ packages/mysql/innodb_extend_slow.patch Thu Mar 31 18:54:15 2011
@@ -49,7 +49,7 @@
/*
IMPLEMENTATION OF THE BUFFER POOL
-@@ -2397,11 +2431,19 @@
+@@ -2399,11 +2433,19 @@
mutex_t* block_mutex;
ibool must_read;
unsigned access_time;
@@ -69,7 +69,7 @@
buf_pool->stat.n_page_gets++;
for (;;) {
-@@ -2419,7 +2461,7 @@
+@@ -2421,7 +2463,7 @@
//buf_pool_mutex_exit(buf_pool);
rw_lock_s_unlock(&buf_pool->page_hash_latch);
@@ -78,7 +78,7 @@
#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
ut_a(++buf_dbg_counter % 37 || buf_validate());
-@@ -2497,6 +2539,13 @@
+@@ -2498,6 +2540,13 @@
/* Let us wait until the read operation
completes */
@@ -92,7 +92,7 @@
for (;;) {
enum buf_io_fix io_fix;
-@@ -2511,6 +2560,12 @@
+@@ -2512,6 +2561,12 @@
break;
}
}
@@ -105,7 +105,7 @@
}
#ifdef UNIV_IBUF_COUNT_DEBUG
-@@ -2823,6 +2878,11 @@
+@@ -2824,6 +2879,11 @@
ibool must_read;
ulint retries = 0;
mutex_t* block_mutex = NULL;
@@ -117,7 +117,7 @@
buf_pool_t* buf_pool = buf_pool_get(space, offset);
ut_ad(mtr);
-@@ -2841,6 +2901,9 @@
+@@ -2842,6 +2902,9 @@
ut_ad(!ibuf_inside() || ibuf_page_low(space, zip_size, offset,
FALSE, file, line, NULL));
#endif
@@ -127,7 +127,7 @@
buf_pool->stat.n_page_gets++;
fold = buf_page_address_fold(space, offset);
loop:
-@@ -2914,7 +2977,7 @@
+@@ -2915,7 +2978,7 @@
return(NULL);
}
@@ -191,7 +191,7 @@
ut_ad(block);
ut_ad(mtr);
@@ -3363,13 +3444,17 @@
- #ifdef UNIV_DEBUG_FILE_ACCESSES
+ #if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG
ut_a(block->page.file_page_was_freed == FALSE);
#endif
+ if (innobase_get_slow_log()) {
@@ -379,7 +379,7 @@
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:36:44.293955189 +0900
+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:42:42.090024586 +0900
-@@ -1527,6 +1527,16 @@
+@@ -1546,6 +1546,16 @@
trx->check_unique_secondary = !thd_test_options(
thd, OPTION_RELAXED_UNIQUE_CHECKS);
@@ -396,7 +396,7 @@
DBUG_VOID_RETURN;
}
-@@ -1581,6 +1591,32 @@
+@@ -1600,6 +1610,32 @@
return(trx);
}
@@ -429,7 +429,7 @@
/*********************************************************************//**
Note that a transaction has been registered with MySQL.
@return true if transaction is registered with MySQL 2PC coordinator */
-@@ -9207,6 +9243,25 @@
+@@ -9280,6 +9316,25 @@
statement has ended */
if (trx->n_mysql_tables_in_use == 0) {
@@ -872,7 +872,7 @@
/* This is set to the MySQL server value for this variable. It is only
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/control_online_alter_index.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_adaptive_hash_index_partitions.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_admin_command_base.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_pages_i_s.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_shm.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_deadlock_count.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_dict_size_limit.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_import.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extend_slow.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extra_rseg.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fast_checksum.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_files_extend.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fix_misc.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_io_patches.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_lru_dump_restore.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_opt_lru_count.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_overwrite_relay_log_info.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_pass_corrupt_table.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_recovery_patches.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_separate_doublewrite.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_lock_name.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status_extend.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_sys_tables.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_split_buf_pool_mutex.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_stats.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_thread_concurrency_timer_based.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_connection_error.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_warnings_suppress.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/microsec_process.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.544&r2=1.545&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_remove_eol_carret.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_syslog.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/optimizer_fix.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/query_cache_enhance.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/response_time_distribution.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_slave_status_nolock.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_temp.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/slow_extended.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/sql_no_fcache.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/userstat.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list