Author: arekm Date: Thu Aug 25 10:08:54 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.5.15
---- Files affected:
packages/mysql:
bug580324.patch (1.3 -> 1.4) , control_online_alter_index.patch (1.5 -> 1.6)
, error_pad.patch (1.3 -> 1.4) , file-contents.patch (1.1 -> 1.2) ,
innodb_adaptive_hash_index_partitions.patch (1.7 -> 1.8) ,
innodb_admin_command_base.patch (1.5 -> 1.6) ,
innodb_buffer_pool_pages_i_s.patch (1.7 -> 1.8) , innodb_buffer_pool_shm.patch
(1.6 -> 1.7) , innodb_bug60788.patch (1.2 -> 1.3) , innodb_deadlock_count.patch
(1.6 -> 1.7) , innodb_dict_size_limit.patch (1.5 -> 1.6) ,
innodb_expand_fast_index_creation.patch (1.2 -> 1.3) ,
innodb_expand_import.patch (1.6 -> 1.7) , innodb_extend_slow.patch (1.7 -> 1.8)
, innodb_extra_rseg.patch (1.5 -> 1.6) , innodb_fast_checksum.patch (1.6 ->
1.7) , innodb_files_extend.patch (1.6 -> 1.7) , innodb_fix_misc.patch (1.8 ->
1.9) , innodb_io_patches.patch (1.6 -> 1.7) , innodb_lru_dump_restore.patch
(1.6 -> 1.7) , innodb_opt_lru_count.patch (1.4 -> 1.5) ,
innodb_overwrite_relay_log_info.patch (1.6 -> 1.7) ,
innodb_pass_corrupt_table.patch (1.8 -> 1.9
) , innodb_recovery_patches.patch (1.7 -> 1.8) ,
innodb_separate_doublewrite.patch (1.8 -> 1.9) , innodb_show_lock_name.patch
(1.5 -> 1.6) , innodb_show_status.patch (1.5 -> 1.6) ,
innodb_show_status_extend.patch (1.6 -> 1.7) , innodb_show_sys_tables.patch
(1.5 -> 1.6) , innodb_split_buf_pool_mutex.patch (1.6 -> 1.7) ,
innodb_stats.patch (1.6 -> 1.7) , innodb_thread_concurrency_timer_based.patch
(1.5 -> 1.6) , log_connection_error.patch (1.5 -> 1.6) ,
log_warnings_suppress.patch (1.4 -> 1.5) , microsec_process.patch (1.4 -> 1.5)
, mysql.spec (1.555 -> 1.556) , mysql_remove_eol_carret.patch (1.4 -> 1.5) ,
mysql_syslog.patch (1.5 -> 1.6) , optimizer_fix.patch (1.5 -> 1.6) , percona.sh
(1.14 -> 1.15) , percona_support.patch (1.2 -> 1.3) ,
processlist_row_stats.patch (1.2 -> 1.3) , query_cache_enhance.patch (1.6 ->
1.7) , remove_fcntl_excessive_calls.patch (1.3 -> 1.4) ,
response_time_distribution.patch (1.5 -> 1.6) , show_slave_status_nolock.patch
(1.5 -> 1.6) , show_temp.patch
(1.5 -> 1.6) , slave_timeout_fix.patch (1.1 -> 1.2) , slow_extended.patch
(1.6 -> 1.7) , sql_no_fcache.patch (1.5 -> 1.6) , start-stop-messages.patch
(1.1 -> 1.2) , userstat.patch (1.6 -> 1.7) , bug813587.patch (NONE -> 1.1)
(NEW), memory_dynamic_rows.patch (NONE -> 1.1) (NEW), utf8_general50_ci.patch
(NONE -> 1.1) (NEW), valgrind_zlib_suppression.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mysql/bug580324.patch
diff -u packages/mysql/bug580324.patch:1.3 packages/mysql/bug580324.patch:1.4
--- packages/mysql/bug580324.patch:1.3 Thu Apr 28 10:02:36 2011
+++ packages/mysql/bug580324.patch Thu Aug 25 12:08:46 2011
@@ -5,9 +5,8 @@
#!!! notice !!!
# 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-04-09 18:49:00.000000000 +0400
-+++ b/sql/sql_base.cc 2011-04-09 18:49:02.000000000 +0400
+--- a/sql/sql_base.cc
++++ b/sql/sql_base.cc
@@ -251,8 +251,12 @@
const TABLE_LIST *table_list,
bool tmp_table)
@@ -23,9 +22,8 @@
if (tmp_table)
{
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-04-09 18:49:00.000000000 +0400
-+++ b/sql/sql_parse.cc 2011-04-09 18:49:02.000000000 +0400
+--- a/sql/sql_parse.cc
++++ b/sql/sql_parse.cc
@@ -1112,11 +1112,18 @@
break;
#else
@@ -93,9 +91,8 @@
thd->set_query(fields, query_length);
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 2011-04-09 18:48:03.000000000 +0400
-+++ b/strings/ctype-utf8.c 2011-04-09 18:49:02.000000000 +0400
+--- a/strings/ctype-utf8.c
++++ b/strings/ctype-utf8.c
@@ -4212,6 +4212,10 @@
{
int code;
================================================================
Index: packages/mysql/control_online_alter_index.patch
diff -u packages/mysql/control_online_alter_index.patch:1.5
packages/mysql/control_online_alter_index.patch:1.6
--- packages/mysql/control_online_alter_index.patch:1.5 Sat Jun 25 17:06:50 2011
+++ packages/mysql/control_online_alter_index.patch Thu Aug 25 12:08:46 2011
@@ -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/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
-@@ -205,6 +205,8 @@
+--- a/sql/handler.h
++++ b/sql/handler.h
+@@ -206,6 +206,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)
@@ -17,9 +16,8 @@
/*
HA_PARTITION_FUNCTION_SUPPORTED indicates that the function is
supported at all.
-diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h 2010-12-02 20:31:56.200956501 +0900
-+++ b/sql/sql_class.h 2010-12-03 13:51:04.744953174 +0900
+--- a/sql/sql_class.h
++++ b/sql/sql_class.h
@@ -481,6 +481,8 @@
my_bool engine_condition_pushdown;
my_bool keep_files_on_create;
@@ -29,10 +27,9 @@
my_bool old_alter_table;
my_bool old_passwords;
my_bool big_tables;
-diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc
---- a/sql/sql_partition.cc 2010-11-03 07:01:14.000000000 +0900
-+++ b/sql/sql_partition.cc 2010-12-03 13:59:56.444039002 +0900
-@@ -4636,7 +4636,12 @@
+--- a/sql/sql_partition.cc
++++ b/sql/sql_partition.cc
+@@ -4637,7 +4637,12 @@
alter_info->num_parts= curr_part_no - new_part_no;
}
}
@@ -46,10 +43,9 @@
{
my_error(ER_PARTITION_FUNCTION_FAILURE, MYF(0));
goto err;
-diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
---- a/sql/sql_table.cc 2010-11-03 07:01:14.000000000 +0900
-+++ b/sql/sql_table.cc 2010-12-03 13:51:04.768955495 +0900
-@@ -6112,6 +6112,10 @@
+--- a/sql/sql_table.cc
++++ b/sql/sql_table.cc
+@@ -6140,6 +6140,10 @@
uint *idx_end_p;
alter_flags= table->file->alter_table_flags(alter_info->flags);
@@ -60,9 +56,8 @@
DBUG_PRINT("info", ("alter_flags: %lu", alter_flags));
/* Check dropped indexes. */
for (idx_p= index_drop_buffer, idx_end_p= idx_p + index_drop_count;
-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
+--- a/sql/sys_vars.cc
++++ b/sql/sys_vars.cc
@@ -2186,6 +2186,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.3 packages/mysql/error_pad.patch:1.4
--- packages/mysql/error_pad.patch:1.3 Thu Apr 28 10:02:36 2011
+++ packages/mysql/error_pad.patch Thu Aug 25 12:08:46 2011
@@ -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/extra/comp_err.c b/extra/comp_err.c
---- 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 @@
+--- a/extra/comp_err.c
++++ b/extra/comp_err.c
+@@ -32,11 +32,12 @@
#include <assert.h>
#include <my_dir.h>
@@ -22,7 +21,7 @@
static char *OUTFILE= (char*) "errmsg.sys";
static char *HEADERFILE= (char*) "mysqld_error.h";
static char *NAMEFILE= (char*) "mysqld_ername.h";
-@@ -89,6 +90,7 @@
+@@ -91,6 +92,7 @@
const char *sql_code1; /* sql state */
const char *sql_code2; /* ODBC state */
struct errors *next_error; /* Pointer to next error */
@@ -30,7 +29,7 @@
DYNAMIC_ARRAY msg; /* All language texts for this error
*/
};
-@@ -127,6 +129,7 @@
+@@ -129,6 +131,7 @@
static struct languages *parse_charset_string(char *str);
@@ -38,7 +37,7 @@
static struct errors *parse_error_string(char *ptr, int er_count);
static struct message *parse_message_string(struct message *new_message,
char *str);
-@@ -251,6 +254,11 @@
+@@ -253,6 +256,11 @@
for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
{
@@ -50,7 +49,7 @@
/*
generating mysqld_error.h
fprintf() will automatically add \r on windows
-@@ -343,12 +351,29 @@
+@@ -345,12 +353,29 @@
"language\n", tmp_error->er_name, tmp_lang->lang_short_name);
goto err;
}
@@ -84,7 +83,7 @@
}
/* continue with header of the errmsg.sys file */
-@@ -499,14 +524,26 @@
+@@ -501,14 +526,26 @@
DBUG_RETURN(0);
continue;
}
@@ -116,7 +115,7 @@
/* add error to the list */
*tail_error= current_error;
-@@ -847,78 +884,122 @@
+@@ -849,78 +886,122 @@
DBUG_RETURN(new_message);
}
================================================================
Index: packages/mysql/file-contents.patch
diff -u packages/mysql/file-contents.patch:1.1
packages/mysql/file-contents.patch:1.2
--- packages/mysql/file-contents.patch:1.1 Sat Jun 25 17:06:50 2011
+++ packages/mysql/file-contents.patch Thu Aug 25 12:08:46 2011
@@ -1,6 +1,6 @@
--- a/mysql-test/t/file_contents.test
+++ b/mysql-test/t/file_contents.test
-@@ -20,7 +20,7 @@ if ($dir_bin =~ m|/usr/|) {
+@@ -20,7 +20,7 @@
$dir_docs = "$dir_docs/packages/MySQL-server";
} else {
# RedHat: version number in directory name
@@ -9,7 +9,7 @@
}
} elsif ($dir_bin =~ m|/usr$|) {
# RPM build during development
-@@ -28,9 +28,12 @@ if ($dir_bin =~ m|/usr/|) {
+@@ -28,9 +28,12 @@
if(-d "$dir_docs/packages/MySQL-server") {
# SuSE
$dir_docs = "$dir_docs/packages/MySQL-server";
================================================================
Index: packages/mysql/innodb_adaptive_hash_index_partitions.patch
diff -u packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.7
packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.8
--- packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.7 Thu Jun
30 20:38:47 2011
+++ packages/mysql/innodb_adaptive_hash_index_partitions.patch Thu Aug 25
12:08:46 2011
@@ -5,9 +5,8 @@
#!!! notice !!!
# Any small change to this file in the main branch
# should be done or reviewed by the maintainer!
-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
+--- a/storage/innobase/btr/btr0btr.c
++++ b/storage/innobase/btr/btr0btr.c
@@ -1518,7 +1518,7 @@
}
ut_a(block);
@@ -35,7 +34,7 @@
btr_blob_dbg_remove(page, index, "btr_page_empty");
/* Recreate the page: note that global data on page (possible
-@@ -3065,7 +3065,7 @@
+@@ -3066,7 +3066,7 @@
mem_heap_free(heap);
}
@@ -44,7 +43,7 @@
/* Make the father empty */
btr_page_empty(father_block, father_page_zip, index, page_level, mtr);
-@@ -3289,7 +3289,7 @@
+@@ -3300,7 +3300,7 @@
goto err_exit;
}
@@ -53,7 +52,7 @@
/* Remove the page from the level list */
btr_level_list_remove(space, zip_size, page, mtr);
-@@ -3330,7 +3330,7 @@
+@@ -3345,7 +3345,7 @@
goto err_exit;
}
@@ -62,7 +61,7 @@
#ifdef UNIV_BTR_DEBUG
if (UNIV_LIKELY_NULL(merge_page_zip)) {
-@@ -3445,7 +3445,7 @@
+@@ -3469,7 +3469,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 +70,7 @@
btr_page_get_father(index, block, mtr, &cursor);
father = btr_cur_get_block(&cursor);
-@@ -3550,7 +3550,7 @@
+@@ -3574,7 +3574,7 @@
page = buf_block_get_frame(block);
ut_a(page_is_comp(merge_page) == page_is_comp(page));
@@ -80,9 +79,8 @@
if (left_page_no == FIL_NULL && !page_is_leaf(page)) {
-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
+--- a/storage/innobase/btr/btr0cur.c
++++ b/storage/innobase/btr/btr0cur.c
@@ -498,7 +498,7 @@
#ifdef UNIV_SEARCH_PERF_STAT
info->n_searches++;
@@ -128,7 +126,7 @@
}
if (page_zip && !dict_index_is_clust(index)
-@@ -2763,7 +2763,7 @@
+@@ -2824,7 +2824,7 @@
}
if (block->is_hashed) {
@@ -137,7 +135,7 @@
}
page_zip = buf_block_get_page_zip(block);
-@@ -2779,7 +2779,7 @@
+@@ -2840,7 +2840,7 @@
}
if (block->is_hashed) {
@@ -146,7 +144,7 @@
}
btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx,
-@@ -2906,13 +2906,13 @@
+@@ -2967,13 +2967,13 @@
== dict_table_is_comp(cursor->index->table));
if (block->is_hashed) {
@@ -162,9 +160,8 @@
}
btr_cur_del_mark_set_sec_rec_log(rec, val, mtr);
-diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
---- a/storage/innobase/btr/btr0sea.c 2010-12-04 15:52:23.387513429 +0900
-+++ b/storage/innobase/btr/btr0sea.c 2010-12-04 16:14:51.721884049 +0900
+--- a/storage/innobase/btr/btr0sea.c
++++ b/storage/innobase/btr/btr0sea.c
@@ -48,6 +48,8 @@
UNIV_INTERN char btr_search_enabled = TRUE;
UNIV_INTERN ibool btr_search_fully_disabled = FALSE;
@@ -961,9 +958,8 @@
if (UNIV_LIKELY_NULL(heap)) {
mem_heap_free(heap);
}
-diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
---- a/storage/innobase/buf/buf0buf.c 2010-12-04 15:55:21.351597052 +0900
-+++ b/storage/innobase/buf/buf0buf.c 2010-12-04 16:12:48.654550708 +0900
+--- a/storage/innobase/buf/buf0buf.c
++++ b/storage/innobase/buf/buf0buf.c
@@ -949,6 +949,7 @@
block->check_index_page_at_flush = FALSE;
@@ -972,7 +968,7 @@
block->is_hashed = FALSE;
-@@ -1481,7 +1482,7 @@
+@@ -1413,7 +1414,7 @@
/* To follow the latching order, we
have to release btr_search_latch
before acquiring block->latch. */
@@ -981,7 +977,7 @@
/* When we release the search latch,
we must rescan all blocks, because
some may become hashed again. */
-@@ -1512,11 +1513,11 @@
+@@ -1444,11 +1445,11 @@
anything. block->is_hashed can only
be set on uncompressed file pages. */
@@ -995,7 +991,7 @@
ut_ad(!btr_search_enabled);
}
-@@ -1535,7 +1536,11 @@
+@@ -1467,7 +1468,11 @@
ibool released_search_latch;
#ifdef UNIV_SYNC_DEBUG
@@ -1008,7 +1004,7 @@
#endif /* UNIV_SYNC_DEBUG */
ut_ad(!btr_search_enabled);
-@@ -2655,6 +2660,7 @@
+@@ -2203,6 +2208,7 @@
{
block->check_index_page_at_flush = FALSE;
block->index = NULL;
@@ -1016,10 +1012,39 @@
block->n_hash_helps = 0;
block->is_hashed = FALSE;
-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
-@@ -1798,7 +1798,7 @@
+--- a/storage/innobase/buf/buf0lru.c
++++ b/storage/innobase/buf/buf0lru.c
+@@ -560,7 +560,7 @@
+
+ mutex_exit(&buf_pool->LRU_list_mutex);
+
+- rw_lock_s_lock(&btr_search_latch);
++ btr_search_s_lock_all();
+ chunk = buf_pool->chunks;
+ for (j = buf_pool->n_chunks; j--; chunk++) {
+ buf_block_t* block = chunk->blocks;
+@@ -572,16 +572,16 @@
+ continue;
+ }
+
+- rw_lock_s_unlock(&btr_search_latch);
++ btr_search_s_unlock_all();
+
+ rw_lock_x_lock(&block->lock);
+- btr_search_drop_page_hash_index(block);
++ btr_search_drop_page_hash_index(block, NULL);
+ rw_lock_x_unlock(&block->lock);
+
+- rw_lock_s_lock(&btr_search_latch);
++ btr_search_s_lock_all();
+ }
+ }
+- rw_lock_s_unlock(&btr_search_latch);
++ btr_search_s_unlock_all();
+ }
+ }
+
+@@ -1744,7 +1744,7 @@
UNIV_MEM_VALID(((buf_block_t*) bpage)->frame,
UNIV_PAGE_SIZE);
@@ -1028,10 +1053,9 @@
UNIV_MEM_INVALID(((buf_block_t*) bpage)->frame,
UNIV_PAGE_SIZE);
-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
-@@ -1811,7 +1811,7 @@
+--- a/storage/innobase/dict/dict0dict.c
++++ b/storage/innobase/dict/dict0dict.c
+@@ -1845,7 +1845,7 @@
zero. */
for (;;) {
@@ -1040,9 +1064,8 @@
if (ref_count == 0) {
break;
}
-diff -ruN a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c
---- a/storage/innobase/ha/ha0ha.c 2010-11-03 07:01:13.000000000 +0900
-+++ b/storage/innobase/ha/ha0ha.c 2010-12-04 16:12:48.665593752 +0900
+--- a/storage/innobase/ha/ha0ha.c
++++ b/storage/innobase/ha/ha0ha.c
@@ -102,7 +102,8 @@
ut_ad(table);
ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
@@ -1053,10 +1076,9 @@
#endif /* UNIV_SYNC_DEBUG */
#ifndef UNIV_HOTBACKUP
-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
-@@ -11702,6 +11702,11 @@
+--- a/storage/innobase/handler/ha_innodb.cc
++++ b/storage/innobase/handler/ha_innodb.cc
+@@ -11718,6 +11718,11 @@
"Disable with --skip-innodb-adaptive-hash-index.",
NULL, innodb_adaptive_hash_index_update, TRUE);
@@ -1068,7 +1090,7 @@
static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
PLUGIN_VAR_RQCMDARG,
"Replication thread delay (ms) on the slave server if "
-@@ -12068,6 +12073,7 @@
+@@ -12085,6 +12090,7 @@
MYSQL_SYSVAR(use_sys_stats_table),
MYSQL_SYSVAR(stats_sample_pages),
MYSQL_SYSVAR(adaptive_hash_index),
@@ -1076,9 +1098,8 @@
MYSQL_SYSVAR(stats_method),
MYSQL_SYSVAR(replication_delay),
MYSQL_SYSVAR(status_file),
-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
+--- a/storage/innobase/include/btr0sea.h
++++ b/storage/innobase/include/btr0sea.h
@@ -85,7 +85,8 @@
ulint
btr_search_info_get_ref_count(
@@ -1174,9 +1195,8 @@
#ifdef UNIV_SEARCH_PERF_STAT
/** Number of successful adaptive hash index lookups */
-diff -ruN a/storage/innobase/include/btr0sea.ic
b/storage/innobase/include/btr0sea.ic
---- a/storage/innobase/include/btr0sea.ic 2010-11-03 07:01:13.000000000
+0900
-+++ b/storage/innobase/include/btr0sea.ic 2010-12-04 16:12:48.709511202
+0900
+--- a/storage/innobase/include/btr0sea.ic
++++ b/storage/innobase/include/btr0sea.ic
@@ -62,8 +62,8 @@
btr_search_t* info;
@@ -1261,10 +1281,9 @@
+ }
+}
+
-diff -ruN a/storage/innobase/include/buf0buf.h
b/storage/innobase/include/buf0buf.h
---- a/storage/innobase/include/buf0buf.h 2010-12-15 19:00:07.713604580
+0900
-+++ b/storage/innobase/include/buf0buf.h 2010-12-15 20:58:03.546839883
+0900
-@@ -1546,7 +1546,7 @@
+--- a/storage/innobase/include/buf0buf.h
++++ b/storage/innobase/include/buf0buf.h
+@@ -1585,7 +1585,7 @@
pointers in the adaptive hash index
pointing to this frame */
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
@@ -1273,7 +1292,7 @@
already been built on this
page; note that it does not
guarantee that the index is
-@@ -1560,6 +1560,7 @@
+@@ -1599,6 +1599,7 @@
unsigned curr_left_side:1;/*!< TRUE or FALSE in hash indexing */
dict_index_t* index; /*!< Index for which the adaptive
hash index has been created. */
@@ -1281,9 +1300,8 @@
/* @} */
# ifdef UNIV_SYNC_DEBUG
/** @name Debug fields */
-diff -ruN a/storage/innobase/include/row0upd.ic
b/storage/innobase/include/row0upd.ic
---- a/storage/innobase/include/row0upd.ic 2010-11-03 07:01:13.000000000
+0900
-+++ b/storage/innobase/include/row0upd.ic 2010-12-04 16:12:48.710551113
+0900
+--- a/storage/innobase/include/row0upd.ic
++++ b/storage/innobase/include/row0upd.ic
@@ -158,7 +158,7 @@
ut_ad(dict_index_is_clust(index));
ut_ad(rec_offs_validate(rec, index, offsets));
@@ -1293,9 +1311,8 @@
ut_ad(!buf_block_align(rec)->is_hashed);
}
#endif /* UNIV_SYNC_DEBUG */
-diff -ruN a/storage/innobase/page/page0page.c
b/storage/innobase/page/page0page.c
---- a/storage/innobase/page/page0page.c 2010-11-03 07:01:13.000000000
+0900
-+++ b/storage/innobase/page/page0page.c 2010-12-04 16:12:48.712550963
+0900
+--- a/storage/innobase/page/page0page.c
++++ b/storage/innobase/page/page0page.c
@@ -218,7 +218,7 @@
const ibool is_hashed = block->is_hashed;
@@ -1314,10 +1331,9 @@
}
#endif /* !UNIV_HOTBACKUP */
}
-diff -ruN a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c
---- a/storage/innobase/page/page0zip.c 2010-12-04 15:57:13.061494433 +0900
-+++ b/storage/innobase/page/page0zip.c 2010-12-04 16:12:48.716470334 +0900
-@@ -4444,7 +4444,7 @@
+--- a/storage/innobase/page/page0zip.c
++++ b/storage/innobase/page/page0zip.c
+@@ -4456,7 +4456,7 @@
#ifndef UNIV_HOTBACKUP
temp_block = buf_block_alloc(buf_pool);
@@ -1326,10 +1342,29 @@
block->check_index_page_at_flush = TRUE;
#else /* !UNIV_HOTBACKUP */
ut_ad(block == back_block1);
-diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
---- a/storage/innobase/row/row0sel.c 2010-12-04 16:09:53.204513572 +0900
-+++ b/storage/innobase/row/row0sel.c 2010-12-04 16:12:48.722551273 +0900
-@@ -1210,7 +1210,7 @@
+--- a/storage/innobase/row/row0mysql.c
++++ b/storage/innobase/row/row0mysql.c
+@@ -2593,7 +2593,7 @@
+ /* check adaptive hash entries */
+ index = dict_table_get_first_index(table);
+ while (index) {
+- ulint ref_count =
btr_search_info_get_ref_count(index->search_info);
++ ulint ref_count =
btr_search_info_get_ref_count(index->search_info, index->id);
+ if (ref_count) {
+ fprintf(stderr, "InnoDB: Warning:"
+ " hash index ref_count (%lu) is
not zero"
+@@ -2954,7 +2954,7 @@
+ table->space = space;
+ index = dict_table_get_first_index(table);
+ do {
+- ulint ref_count =
btr_search_info_get_ref_count(index->search_info);
++ ulint ref_count =
btr_search_info_get_ref_count(index->search_info, index->id);
+ /* check adaptive hash entries */
+ if (ref_count) {
+ fprintf(stderr, "InnoDB: Warning:"
+--- a/storage/innobase/row/row0sel.c
++++ b/storage/innobase/row/row0sel.c
+@@ -1211,7 +1211,7 @@
ut_ad(plan->unique_search);
ut_ad(!plan->must_get_clust);
#ifdef UNIV_SYNC_DEBUG
@@ -1338,7 +1373,7 @@
#endif /* UNIV_SYNC_DEBUG */
row_sel_open_pcur(plan, TRUE, mtr);
-@@ -1381,10 +1381,10 @@
+@@ -1382,10 +1382,10 @@
&& !plan->must_get_clust
&& !plan->table->big_rows) {
if (!search_latch_locked) {
@@ -1351,7 +1386,7 @@
/* There is an x-latch request waiting: release the
s-latch for a moment; as an s-latch here is often
-@@ -1393,8 +1393,8 @@
+@@ -1394,8 +1394,8 @@
from acquiring an s-latch for a long time, lowering
performance significantly in multiprocessors. */
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/bug580324.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/control_online_alter_index.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/error_pad.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/file-contents.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_adaptive_hash_index_partitions.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_admin_command_base.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_pages_i_s.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_shm.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_bug60788.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_deadlock_count.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_dict_size_limit.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_fast_index_creation.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.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extend_slow.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extra_rseg.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fast_checksum.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_files_extend.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fix_misc.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_io_patches.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_lru_dump_restore.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_opt_lru_count.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.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_pass_corrupt_table.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_recovery_patches.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_separate_doublewrite.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_lock_name.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status_extend.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_sys_tables.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_split_buf_pool_mutex.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_stats.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_thread_concurrency_timer_based.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_connection_error.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_warnings_suppress.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/microsec_process.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.555&r2=1.556&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_remove_eol_carret.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_syslog.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/optimizer_fix.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/percona.sh?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/percona_support.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/processlist_row_stats.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.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/remove_fcntl_excessive_calls.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.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_slave_status_nolock.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_temp.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/slave_timeout_fix.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/slow_extended.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/sql_no_fcache.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/start-stop-messages.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/userstat.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
