Author: arekm Date: Thu Apr 28 08:02:43 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.5.11
---- Files affected:
packages/mysql:
bug580324.patch (1.2 -> 1.3) , control_online_alter_index.patch (1.3 -> 1.4)
, error_pad.patch (1.2 -> 1.3) , innodb_adaptive_hash_index_partitions.patch
(1.4 -> 1.5) , innodb_admin_command_base.patch (1.3 -> 1.4) ,
innodb_buffer_pool_pages_i_s.patch (1.4 -> 1.5) , innodb_buffer_pool_shm.patch
(1.4 -> 1.5) , innodb_deadlock_count.patch (1.4 -> 1.5) ,
innodb_dict_size_limit.patch (1.3 -> 1.4) , innodb_expand_import.patch (1.4 ->
1.5) , innodb_extend_slow.patch (1.3 -> 1.4) , innodb_extra_rseg.patch (1.3 ->
1.4) , innodb_fast_checksum.patch (1.4 -> 1.5) , innodb_files_extend.patch (1.4
-> 1.5) , innodb_fix_misc.patch (1.4 -> 1.5) , innodb_io_patches.patch (1.3 ->
1.4) , innodb_lru_dump_restore.patch (1.4 -> 1.5) ,
innodb_overwrite_relay_log_info.patch (1.4 -> 1.5) ,
innodb_pass_corrupt_table.patch (1.4 -> 1.5) , innodb_recovery_patches.patch
(1.4 -> 1.5) , innodb_separate_doublewrite.patch (1.4 -> 1.5) ,
innodb_show_lock_name.patch (1.3 -> 1.4) , innodb_show_status.patch (1.
3 -> 1.4) , innodb_show_status_extend.patch (1.4 -> 1.5) ,
innodb_show_sys_tables.patch (1.3 -> 1.4) , innodb_split_buf_pool_mutex.patch
(1.3 -> 1.4) , innodb_stats.patch (1.4 -> 1.5) ,
innodb_thread_concurrency_timer_based.patch (1.3 -> 1.4) ,
log_connection_error.patch (1.3 -> 1.4) , log_warnings_suppress.patch (1.2 ->
1.3) , mysql.spec (1.547 -> 1.548) , mysql_remove_eol_carret.patch (1.2 -> 1.3)
, mysql_syslog.patch (1.3 -> 1.4) , optimizer_fix.patch (1.3 -> 1.4) ,
query_cache_enhance.patch (1.4 -> 1.5) , response_time_distribution.patch (1.3
-> 1.4) , show_slave_status_nolock.patch (1.3 -> 1.4) , show_temp.patch (1.3 ->
1.4) , slow_extended.patch (1.4 -> 1.5) , sql_no_fcache.patch (1.3 -> 1.4) ,
userstat.patch (1.4 -> 1.5) , innodb_bug60788.patch (NONE -> 1.1) (NEW),
innodb_expand_fast_index_creation.patch (NONE -> 1.1) (NEW),
start-stop-messages.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mysql/bug580324.patch
diff -u packages/mysql/bug580324.patch:1.2 packages/mysql/bug580324.patch:1.3
--- packages/mysql/bug580324.patch:1.2 Sat Feb 19 23:16:58 2011
+++ packages/mysql/bug580324.patch Thu Apr 28 10:02:36 2011
@@ -6,8 +6,8 @@
# Any small change to this file in the main branch
# should be done or reviewed by the maintainer!
diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc
---- a/sql/sql_base.cc 2011-01-11 21:35:26.000000000 +0300
-+++ b/sql/sql_base.cc 2011-01-11 21:42:02.000000000 +0300
+--- a/sql/sql_base.cc 2011-04-09 18:49:00.000000000 +0400
++++ b/sql/sql_base.cc 2011-04-09 18:49:02.000000000 +0400
@@ -251,8 +251,12 @@
const TABLE_LIST *table_list,
bool tmp_table)
@@ -24,9 +24,9 @@
{
int4store(key + key_length, thd->server_id);
diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
---- a/sql/sql_parse.cc 2011-01-11 21:35:26.000000000 +0300
-+++ b/sql/sql_parse.cc 2011-01-11 21:48:50.000000000 +0300
-@@ -1113,11 +1113,18 @@
+--- a/sql/sql_parse.cc 2011-04-09 18:49:00.000000000 +0400
++++ b/sql/sql_parse.cc 2011-04-09 18:49:02.000000000 +0400
+@@ -1112,11 +1112,18 @@
break;
#else
{
@@ -46,7 +46,7 @@
/*
SHOW statements should not add the used tables to the list of tables
used in a transaction.
-@@ -1130,24 +1137,23 @@
+@@ -1129,24 +1136,23 @@
/*
We have name + wildcard in packet, separated by endzero
*/
@@ -83,7 +83,7 @@
mysql_reset_thd_for_next_command(thd);
lex_start(thd);
/* Must be before we init the table list. */
-@@ -1172,9 +1178,6 @@
+@@ -1171,9 +1177,6 @@
table_list.schema_table= schema_table;
}
@@ -94,8 +94,8 @@
general_log_print(thd, command, "%s %s", table_list.table_name, fields);
diff -ruN a/strings/ctype-utf8.c b/strings/ctype-utf8.c
---- a/strings/ctype-utf8.c 2010-12-03 20:58:26.000000000 +0300
-+++ b/strings/ctype-utf8.c 2011-01-11 21:42:02.000000000 +0300
+--- a/strings/ctype-utf8.c 2011-04-09 18:48:03.000000000 +0400
++++ b/strings/ctype-utf8.c 2011-04-09 18:49:02.000000000 +0400
@@ -4212,6 +4212,10 @@
{
int code;
================================================================
Index: packages/mysql/control_online_alter_index.patch
diff -u packages/mysql/control_online_alter_index.patch:1.3
packages/mysql/control_online_alter_index.patch:1.4
--- packages/mysql/control_online_alter_index.patch:1.3 Thu Mar 31 18:54:15 2011
+++ packages/mysql/control_online_alter_index.patch Thu Apr 28 10:02:36 2011
@@ -8,7 +8,7 @@
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
-@@ -197,6 +197,8 @@
+@@ -203,6 +203,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)
@@ -63,7 +63,7 @@
diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc
--- a/sql/sys_vars.cc 2010-12-02 21:23:05.569356468 +0900
+++ b/sql/sys_vars.cc 2010-12-03 14:05:28.857356603 +0900
-@@ -2140,6 +2140,13 @@
+@@ -2150,6 +2150,13 @@
GLOBAL_VAR(opt_optimizer_fix),
NO_CMD_LINE, DEFAULT(TRUE));
================================================================
Index: packages/mysql/error_pad.patch
diff -u packages/mysql/error_pad.patch:1.2 packages/mysql/error_pad.patch:1.3
--- packages/mysql/error_pad.patch:1.2 Sat Feb 19 23:16:59 2011
+++ packages/mysql/error_pad.patch Thu Apr 28 10:02:36 2011
@@ -6,8 +6,8 @@
# Any small change to this file in the main branch
# should be done or reviewed by the maintainer!
diff -ruN a/extra/comp_err.c b/extra/comp_err.c
---- a/extra/comp_err.c 2010-08-03 17:24:24.000000000 +0000
-+++ b/extra/comp_err.c 2010-09-14 16:49:28.000000000 +0000
+--- a/extra/comp_err.c 2011-04-09 18:48:04.000000000 +0400
++++ b/extra/comp_err.c 2011-04-09 18:48:56.000000000 +0400
@@ -30,11 +30,12 @@
#include <assert.h>
#include <my_dir.h>
@@ -38,7 +38,7 @@
static struct errors *parse_error_string(char *ptr, int er_count);
static struct message *parse_message_string(struct message *new_message,
char *str);
-@@ -252,6 +255,11 @@
+@@ -251,6 +254,11 @@
for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
{
@@ -50,7 +50,7 @@
/*
generating mysqld_error.h
fprintf() will automatically add \r on windows
-@@ -344,12 +352,29 @@
+@@ -343,12 +351,29 @@
"language\n", tmp_error->er_name, tmp_lang->lang_short_name);
goto err;
}
@@ -84,7 +84,7 @@
}
/* continue with header of the errmsg.sys file */
-@@ -500,14 +525,26 @@
+@@ -499,14 +524,26 @@
DBUG_RETURN(0);
continue;
}
@@ -116,7 +116,7 @@
/* add error to the list */
*tail_error= current_error;
-@@ -848,78 +885,122 @@
+@@ -847,78 +884,122 @@
DBUG_RETURN(new_message);
}
================================================================
Index: packages/mysql/innodb_adaptive_hash_index_partitions.patch
diff -u packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.4
packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.5
--- packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.4 Thu Mar
31 18:54:15 2011
+++ packages/mysql/innodb_adaptive_hash_index_partitions.patch Thu Apr 28
10:02:36 2011
@@ -8,7 +8,7 @@
diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
--- a/storage/innobase/btr/btr0btr.c 2010-12-04 15:52:23.355483176 +0900
+++ b/storage/innobase/btr/btr0btr.c 2010-12-04 16:12:48.639514256 +0900
-@@ -954,7 +954,7 @@
+@@ -1518,7 +1518,7 @@
}
ut_a(block);
@@ -17,7 +17,7 @@
header = buf_block_get_frame(block) + PAGE_HEADER + PAGE_BTR_SEG_TOP;
#ifdef UNIV_BTR_DEBUG
-@@ -1023,7 +1023,7 @@
+@@ -1587,7 +1587,7 @@
#ifndef UNIV_HOTBACKUP
if (UNIV_LIKELY(!recovery)) {
@@ -26,16 +26,16 @@
}
block->check_index_page_at_flush = TRUE;
-@@ -1188,7 +1188,7 @@
+@@ -1755,7 +1755,7 @@
ut_a(!page_zip || page_zip_validate(page_zip, page));
#endif /* UNIV_ZIP_DEBUG */
- btr_search_drop_page_hash_index(block);
+ btr_search_drop_page_hash_index(block, index);
+ btr_blob_dbg_remove(page, index, "btr_page_empty");
/* Recreate the page: note that global data on page (possible
- segment headers, next page-field, etc.) is preserved intact */
-@@ -2497,7 +2497,7 @@
+@@ -3065,7 +3065,7 @@
mem_heap_free(heap);
}
@@ -44,7 +44,7 @@
/* Make the father empty */
btr_page_empty(father_block, father_page_zip, index, page_level, mtr);
-@@ -2720,7 +2720,7 @@
+@@ -3289,7 +3289,7 @@
goto err_exit;
}
@@ -53,7 +53,7 @@
/* Remove the page from the level list */
btr_level_list_remove(space, zip_size, page, mtr);
-@@ -2761,7 +2761,7 @@
+@@ -3330,7 +3330,7 @@
goto err_exit;
}
@@ -62,7 +62,7 @@
#ifdef UNIV_BTR_DEBUG
if (UNIV_LIKELY_NULL(merge_page_zip)) {
-@@ -2875,7 +2875,7 @@
+@@ -3445,7 +3445,7 @@
ut_a(btr_page_get_next(page, mtr) == FIL_NULL);
ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
@@ -71,7 +71,7 @@
btr_page_get_father(index, block, mtr, &cursor);
father = btr_cur_get_block(&cursor);
-@@ -2980,7 +2980,7 @@
+@@ -3550,7 +3550,7 @@
page = buf_block_get_frame(block);
ut_a(page_is_comp(merge_page) == page_is_comp(page));
@@ -137,7 +137,7 @@
}
page_zip = buf_block_get_page_zip(block);
-@@ -2778,7 +2778,7 @@
+@@ -2779,7 +2779,7 @@
}
if (block->is_hashed) {
@@ -146,7 +146,7 @@
}
btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx,
-@@ -2905,13 +2905,13 @@
+@@ -2906,13 +2906,13 @@
== dict_table_is_comp(cursor->index->table));
if (block->is_hashed) {
@@ -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
-@@ -11671,6 +11671,11 @@
+@@ -11682,6 +11682,11 @@
"Disable with --skip-innodb-adaptive-hash-index.",
NULL, innodb_adaptive_hash_index_update, TRUE);
@@ -1066,7 +1066,7 @@
static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
PLUGIN_VAR_RQCMDARG,
"Replication thread delay (ms) on the slave server if "
-@@ -12041,6 +12046,7 @@
+@@ -12047,6 +12052,7 @@
MYSQL_SYSVAR(use_sys_stats_table),
MYSQL_SYSVAR(stats_sample_pages),
MYSQL_SYSVAR(adaptive_hash_index),
@@ -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
-@@ -2048,7 +2048,9 @@
+@@ -2050,7 +2050,9 @@
"-------------------------------------\n", file);
ibuf_print(file);
@@ -1480,7 +1480,7 @@
fprintf(file,
"%.2f hash searches/s, %.2f non-hash searches/s\n",
-@@ -2073,14 +2075,15 @@
+@@ -2075,14 +2077,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) {
-@@ -2107,10 +2110,10 @@
+@@ -2109,10 +2112,10 @@
" Threads %lu \t(%lu + %lu)\n",
(ulong) (btr_search_sys
@@ -1535,7 +1535,7 @@
diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
--- a/storage/innobase/trx/trx0trx.c 2010-12-03 17:49:11.623953784 +0900
+++ b/storage/innobase/trx/trx0trx.c 2010-12-04 16:12:48.731513275 +0900
-@@ -266,8 +266,14 @@
+@@ -267,8 +267,14 @@
/*=================================*/
trx_t* trx) /*!< in: transaction */
{
================================================================
Index: packages/mysql/innodb_admin_command_base.patch
diff -u packages/mysql/innodb_admin_command_base.patch:1.3
packages/mysql/innodb_admin_command_base.patch:1.4
--- packages/mysql/innodb_admin_command_base.patch:1.3 Thu Mar 31 18:54:15 2011
+++ packages/mysql/innodb_admin_command_base.patch Thu Apr 28 10:02:36 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
-@@ -11833,7 +11833,8 @@
+@@ -11839,7 +11839,8 @@
i_s_innodb_sys_foreign_cols,
i_s_innodb_sys_stats,
i_s_innodb_table_stats,
@@ -21,7 +21,7 @@
diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
--- a/storage/innobase/handler/i_s.cc 2010-12-03 17:30:16.299955549 +0900
+++ b/storage/innobase/handler/i_s.cc 2010-12-03 17:32:35.425989972 +0900
-@@ -4161,3 +4161,139 @@
+@@ -4179,3 +4179,139 @@
STRUCT_FLD(system_vars, NULL),
STRUCT_FLD(__reserved1, NULL)
};
================================================================
Index: packages/mysql/innodb_buffer_pool_pages_i_s.patch
diff -u packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.4
packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.5
--- packages/mysql/innodb_buffer_pool_pages_i_s.patch:1.4 Thu Mar 31
18:54:15 2011
+++ packages/mysql/innodb_buffer_pool_pages_i_s.patch Thu Apr 28 10:02:36 2011
@@ -8,7 +8,7 @@
diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
--- a/storage/innobase/buf/buf0buf.c 2010-12-04 20:20:44.595483291 +0900
+++ b/storage/innobase/buf/buf0buf.c 2010-12-06 19:28:04.055227506 +0900
-@@ -4516,6 +4516,36 @@
+@@ -4519,6 +4519,36 @@
mutex_exit(block_mutex);
}
@@ -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
-@@ -12121,6 +12121,9 @@
+@@ -12127,6 +12127,9 @@
i_s_innodb_sys_stats,
i_s_innodb_table_stats,
i_s_innodb_index_stats,
@@ -69,7 +69,7 @@
}
static const char plugin_author[] = "Innobase Oy";
-@@ -4328,3 +4329,701 @@
+@@ -4346,3 +4347,701 @@
STRUCT_FLD(system_vars, NULL),
STRUCT_FLD(__reserved1, NULL)
};
================================================================
Index: packages/mysql/innodb_buffer_pool_shm.patch
diff -u packages/mysql/innodb_buffer_pool_shm.patch:1.4
packages/mysql/innodb_buffer_pool_shm.patch:1.5
--- packages/mysql/innodb_buffer_pool_shm.patch:1.4 Thu Mar 31 18:54:15 2011
+++ packages/mysql/innodb_buffer_pool_shm.patch Thu Apr 28 10:02:36 2011
@@ -6,8 +6,8 @@
# Any small change to this file in the main branch
# should be done or reviewed by the maintainer!
diff -ruN a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c
---- a/storage/innobase/buf/buf0buddy.c 2010-12-04 19:46:39.372513543 +0900
-+++ b/storage/innobase/buf/buf0buddy.c 2010-12-07 17:56:28.302087851 +0900
+--- a/storage/innobase/buf/buf0buddy.c 2011-04-09 18:48:28.000000000 +0400
++++ b/storage/innobase/buf/buf0buddy.c 2011-04-09 18:48:48.000000000 +0400
@@ -183,7 +183,7 @@
void* buf, /*!< in: buffer frame to deallocate */
ibool have_page_hash_mutex)
@@ -27,8 +27,8 @@
ut_ad(!mutex_own(&buf_pool->zip_mutex));
ut_ad(buf_block_get_state(block) == BUF_BLOCK_READY_FOR_USE);
diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c 2010-12-06 20:16:21.726195340 +0900
-+++ b/storage/innobase/buf/buf0buf.c 2010-12-07 20:40:30.824749814 +0900
+--- a/storage/innobase/buf/buf0buf.c 2011-04-09 18:48:47.000000000 +0400
++++ b/storage/innobase/buf/buf0buf.c 2011-04-09 18:48:48.000000000 +0400
@@ -53,6 +53,10 @@
#include "page0zip.h"
#include "trx0trx.h"
@@ -658,8 +658,8 @@
if (srv_buf_pool_old_size == srv_buf_pool_size) {
diff -ruN a/storage/innobase/ha/hash0hash.c b/storage/innobase/ha/hash0hash.c
---- a/storage/innobase/ha/hash0hash.c 2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/ha/hash0hash.c 2010-12-07 16:10:14.937749140 +0900
+--- a/storage/innobase/ha/hash0hash.c 2011-04-09 18:48:05.000000000 +0400
++++ b/storage/innobase/ha/hash0hash.c 2011-04-09 18:48:48.000000000 +0400
@@ -133,6 +133,70 @@
}
@@ -732,8 +732,8 @@
UNIV_INTERN
void
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-06 20:16:21.733263627
+0900
-+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-07 17:56:28.316139830
+0900
+--- a/storage/innobase/handler/ha_innodb.cc 2011-04-09 18:48:47.000000000
+0400
++++ b/storage/innobase/handler/ha_innodb.cc 2011-04-09 18:48:48.000000000
+0400
@@ -194,6 +194,7 @@
static my_bool innobase_create_status_file = FALSE;
static my_bool innobase_stats_on_metadata = TRUE;
@@ -765,7 +765,7 @@
#ifdef HAVE_LARGE_PAGES
if ((os_use_large_pages = (ibool) my_use_large_pages))
-@@ -11702,6 +11712,16 @@
+@@ -11713,6 +11723,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.",
-@@ -12000,6 +12020,8 @@
+@@ -12006,6 +12026,8 @@
MYSQL_SYSVAR(autoextend_increment),
MYSQL_SYSVAR(buffer_pool_size),
MYSQL_SYSVAR(buffer_pool_instances),
@@ -792,8 +792,8 @@
MYSQL_SYSVAR(fast_checksum),
MYSQL_SYSVAR(commit_concurrency),
diff -ruN a/storage/innobase/include/buf0buf.h
b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h 2010-12-06 20:16:21.778264552
+0900
-+++ b/storage/innobase/include/buf0buf.h 2010-12-07 17:56:28.322749380
+0900
+--- a/storage/innobase/include/buf0buf.h 2011-04-09 18:48:47.000000000
+0400
++++ b/storage/innobase/include/buf0buf.h 2011-04-09 18:48:48.000000000
+0400
@@ -36,6 +36,7 @@
#ifndef UNIV_HOTBACKUP
#include "ut0rbt.h"
@@ -819,8 +819,8 @@
/** A chunk of buffers. The buffer pool is allocated in chunks. */
diff -ruN a/storage/innobase/include/hash0hash.h
b/storage/innobase/include/hash0hash.h
---- a/storage/innobase/include/hash0hash.h 2010-11-03 07:01:13.000000000
+0900
-+++ b/storage/innobase/include/hash0hash.h 2010-12-07 17:56:28.324726446
+0900
+--- a/storage/innobase/include/hash0hash.h 2011-04-09 18:48:05.000000000
+0400
++++ b/storage/innobase/include/hash0hash.h 2011-04-09 18:48:48.000000000
+0400
@@ -49,6 +49,28 @@
hash_create(
/*========*/
@@ -903,8 +903,8 @@
/************************************************************//**
Gets the mutex index for a fold value in a hash table.
diff -ruN a/storage/innobase/include/os0proc.h
b/storage/innobase/include/os0proc.h
---- a/storage/innobase/include/os0proc.h 2010-11-03 07:01:13.000000000
+0900
-+++ b/storage/innobase/include/os0proc.h 2010-12-07 16:10:14.955718750
+0900
+--- a/storage/innobase/include/os0proc.h 2011-04-09 18:48:05.000000000
+0400
++++ b/storage/innobase/include/os0proc.h 2011-04-09 18:48:48.000000000
+0400
@@ -32,6 +32,11 @@
#ifdef UNIV_LINUX
#include <sys/ipc.h>
@@ -948,8 +948,8 @@
#include "os0proc.ic"
#endif
diff -ruN a/storage/innobase/include/srv0srv.h
b/storage/innobase/include/srv0srv.h
---- a/storage/innobase/include/srv0srv.h 2010-12-04 20:20:28.016566697
+0900
-+++ b/storage/innobase/include/srv0srv.h 2010-12-07 16:10:14.956717659
+0900
+--- a/storage/innobase/include/srv0srv.h 2011-04-09 18:48:45.000000000
+0400
++++ b/storage/innobase/include/srv0srv.h 2011-04-09 18:48:48.000000000
+0400
@@ -171,6 +171,10 @@
extern ulint srv_mem_pool_size;
extern ulint srv_lock_table_size;
@@ -962,8 +962,8 @@
extern ulint srv_n_file_io_threads;
diff -ruN a/storage/innobase/include/ut0lst.h
b/storage/innobase/include/ut0lst.h
---- a/storage/innobase/include/ut0lst.h 2010-11-03 07:01:13.000000000
+0900
-+++ b/storage/innobase/include/ut0lst.h 2010-12-07 16:10:14.957785525
+0900
+--- a/storage/innobase/include/ut0lst.h 2011-04-09 18:48:05.000000000
+0400
++++ b/storage/innobase/include/ut0lst.h 2011-04-09 18:48:48.000000000
+0400
@@ -257,5 +257,48 @@
ut_a(ut_list_node_313 == NULL); \
} while (0)
@@ -1014,8 +1014,8 @@
#endif
diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
---- a/storage/innobase/log/log0recv.c 2010-12-04 19:46:40.212513377 +0900
-+++ b/storage/innobase/log/log0recv.c 2010-12-07 16:10:14.959785817 +0900
+--- a/storage/innobase/log/log0recv.c 2011-04-09 18:48:42.000000000 +0400
++++ b/storage/innobase/log/log0recv.c 2011-04-09 18:48:48.000000000 +0400
@@ -2912,6 +2912,7 @@
/*==========================*/
{
@@ -1025,8 +1025,8 @@
recv_needed_recovery = TRUE;
diff -ruN a/storage/innobase/os/os0proc.c b/storage/innobase/os/os0proc.c
---- a/storage/innobase/os/os0proc.c 2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/os/os0proc.c 2010-12-07 16:10:14.960800123 +0900
+--- a/storage/innobase/os/os0proc.c 2011-04-09 18:48:05.000000000 +0400
++++ b/storage/innobase/os/os0proc.c 2011-04-09 18:48:48.000000000 +0400
@@ -229,3 +229,173 @@
}
#endif
@@ -1202,8 +1202,8 @@
+#endif /* HAVE_SYS_IPC_H && HAVE_SYS_SHM_H */
+}
diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
---- a/storage/innobase/srv/srv0srv.c 2010-12-04 20:20:44.687550693 +0900
-+++ b/storage/innobase/srv/srv0srv.c 2010-12-07 16:10:14.962785720 +0900
+--- a/storage/innobase/srv/srv0srv.c 2011-04-09 18:48:46.000000000 +0400
++++ b/storage/innobase/srv/srv0srv.c 2011-04-09 18:48:48.000000000 +0400
@@ -235,6 +235,11 @@
UNIV_INTERN ulint srv_mem_pool_size = ULINT_MAX;
UNIV_INTERN ulint srv_lock_table_size = ULINT_MAX;
@@ -1217,9 +1217,9 @@
instead. */
UNIV_INTERN ulint srv_n_file_io_threads = ULINT_MAX;
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
-@@ -1838,6 +1838,8 @@
+--- a/storage/innobase/srv/srv0start.c 2011-04-09 18:48:43.000000000 +0400
++++ b/storage/innobase/srv/srv0start.c 2011-04-09 18:48:48.000000000 +0400
+@@ -1844,6 +1844,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.4
packages/mysql/innodb_deadlock_count.patch:1.5
--- packages/mysql/innodb_deadlock_count.patch:1.4 Thu Mar 31 18:54:15 2011
+++ packages/mysql/innodb_deadlock_count.patch Thu Apr 28 10:02:36 2011
@@ -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
-@@ -774,6 +774,7 @@
+@@ -776,6 +776,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
-@@ -473,6 +473,7 @@
+@@ -475,6 +475,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;
-@@ -2291,6 +2292,7 @@
+@@ -2293,6 +2294,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.3
packages/mysql/innodb_dict_size_limit.patch:1.4
--- packages/mysql/innodb_dict_size_limit.patch:1.3 Thu Mar 31 18:54:15 2011
+++ packages/mysql/innodb_dict_size_limit.patch Thu Apr 28 10:02:36 2011
@@ -384,9 +384,9 @@
{"have_atomic_builtins",
(char*) &export_vars.innodb_have_atomic_builtins, SHOW_BOOL},
{"log_waits",
-@@ -11616,6 +11618,11 @@
- "Number of extra user rollback segments which are used in a round-robin
fashion.",
- NULL, NULL, 127, 0, 127, 0);
+@@ -11618,6 +11620,11 @@
+ "Choose method of innodb_adaptive_flushing. (native, [estimate],
keep_average)",
+ NULL, innodb_adaptive_flushing_method_update, 1,
&adaptive_flushing_method_typelib);
+static MYSQL_SYSVAR_ULONG(dict_size_limit, srv_dict_size_limit,
+ PLUGIN_VAR_RQCMDARG,
@@ -396,10 +396,10 @@
static struct st_mysql_sys_var* innobase_system_variables[]= {
MYSQL_SYSVAR(additional_mem_pool_size),
MYSQL_SYSVAR(autoextend_increment),
-@@ -11684,6 +11691,7 @@
+@@ -11685,6 +11692,7 @@
+ MYSQL_SYSVAR(flush_neighbor_pages),
MYSQL_SYSVAR(read_ahead),
MYSQL_SYSVAR(adaptive_flushing_method),
- MYSQL_SYSVAR(extra_rsegments),
+ MYSQL_SYSVAR(dict_size_limit),
MYSQL_SYSVAR(use_sys_malloc),
MYSQL_SYSVAR(use_native_aio),
@@ -454,7 +454,7 @@
diff -ruN a/storage/innobase/include/dict0dict.h
b/storage/innobase/include/dict0dict.h
--- a/storage/innobase/include/dict0dict.h 2010-11-03 07:01:13.000000000
+0900
+++ b/storage/innobase/include/dict0dict.h 2010-12-03 15:45:47.558024515
+0900
-@@ -1158,6 +1158,12 @@
+@@ -1170,6 +1170,12 @@
/*====================================*/
dict_table_t* table, /*!< in: table */
const char* name); /*!< in: name of the index to find */
@@ -484,7 +484,7 @@
return(table);
}
-@@ -877,6 +884,12 @@
+@@ -905,6 +912,12 @@
table = dict_load_table_on_id(table_id);
}
@@ -500,16 +500,15 @@
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
-@@ -233,7 +233,7 @@
+@@ -232,6 +232,7 @@
+ extern ulint srv_read_ahead;
extern ulint srv_adaptive_flushing_method;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/bug580324.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/control_online_alter_index.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/error_pad.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.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_admin_command_base.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_pages_i_s.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_shm.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_deadlock_count.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_dict_size_limit.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_import.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extend_slow.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extra_rseg.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fast_checksum.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_files_extend.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fix_misc.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_io_patches.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_lru_dump_restore.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_overwrite_relay_log_info.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_pass_corrupt_table.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_recovery_patches.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_separate_doublewrite.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_lock_name.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status_extend.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_sys_tables.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_split_buf_pool_mutex.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_stats.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_thread_concurrency_timer_based.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_connection_error.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_warnings_suppress.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.547&r2=1.548&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_remove_eol_carret.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_syslog.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/optimizer_fix.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/query_cache_enhance.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/response_time_distribution.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_slave_status_nolock.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_temp.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/slow_extended.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/sql_no_fcache.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/userstat.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
