packages: mysql/control_online_alter_index.patch, mysql/innodb_adaptive_has...

arekm arekm at pld-linux.org
Sat Jun 25 17:06:57 CEST 2011


Author: arekm                        Date: Sat Jun 25 15:06:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.5.13

---- Files affected:
packages/mysql:
   control_online_alter_index.patch (1.4 -> 1.5) , innodb_adaptive_hash_index_partitions.patch (1.5 -> 1.6) , innodb_admin_command_base.patch (1.4 -> 1.5) , innodb_buffer_pool_pages_i_s.patch (1.5 -> 1.6) , innodb_buffer_pool_shm.patch (1.5 -> 1.6) , innodb_deadlock_count.patch (1.5 -> 1.6) , innodb_dict_size_limit.patch (1.4 -> 1.5) , innodb_expand_fast_index_creation.patch (1.1 -> 1.2) , innodb_expand_import.patch (1.5 -> 1.6) , innodb_extend_slow.patch (1.4 -> 1.5) , innodb_extra_rseg.patch (1.4 -> 1.5) , innodb_fast_checksum.patch (1.5 -> 1.6) , innodb_files_extend.patch (1.5 -> 1.6) , innodb_fix_misc.patch (1.5 -> 1.6) , innodb_io_patches.patch (1.4 -> 1.5) , innodb_lru_dump_restore.patch (1.5 -> 1.6) , innodb_opt_lru_count.patch (1.3 -> 1.4) , innodb_overwrite_relay_log_info.patch (1.5 -> 1.6) , innodb_pass_corrupt_table.patch (1.5 -> 1.6) , innodb_recovery_patches.patch (1.5 -> 1.6) , innodb_separate_doublewrite.patch (1.5 -> 1.6) , innodb_show_lock_name.patch (1.4 -> 1.5) , innodb_show_status.patch (1.4 -> 1.5) , innodb_show_status_extend.patch (1.5 -> 1.6) , innodb_show_sys_tables.patch (1.4 -> 1.5) , innodb_split_buf_pool_mutex.patch (1.4 -> 1.5) , innodb_stats.patch (1.5 -> 1.6) , innodb_thread_concurrency_timer_based.patch (1.4 -> 1.5) , log_connection_error.patch (1.4 -> 1.5) , log_warnings_suppress.patch (1.3 -> 1.4) , microsec_process.patch (1.3 -> 1.4) , mysql.spec (1.550 -> 1.551) , mysql_dump_ignore_ct.patch (1.4 -> 1.5) , mysql_remove_eol_carret.patch (1.3 -> 1.4) , mysql_syslog.patch (1.4 -> 1.5) , optimizer_fix.patch (1.4 -> 1.5) , percona_support.patch (1.1 -> 1.2) , processlist_row_stats.patch (1.1 -> 1.2) , query_cache_enhance.patch (1.5 -> 1.6) , response_time_distribution.patch (1.4 -> 1.5) , show_slave_status_nolock.patch (1.4 -> 1.5) , show_temp.patch (1.4 -> 1.5) , slow_extended.patch (1.5 -> 1.6) , sql_no_fcache.patch (1.4 -> 1.5) , userstat.patch (1.5 -> 1.6) , file-contents.patch (NONE -> 1.1)  (NEW), slave_timeout_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql/control_online_alter_index.patch
diff -u packages/mysql/control_online_alter_index.patch:1.4 packages/mysql/control_online_alter_index.patch:1.5
--- packages/mysql/control_online_alter_index.patch:1.4	Thu Apr 28 10:02:36 2011
+++ packages/mysql/control_online_alter_index.patch	Sat Jun 25 17:06:50 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
-@@ -203,6 +203,8 @@
+@@ -205,6 +205,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)
@@ -49,7 +49,7 @@
 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
-@@ -6117,6 +6117,10 @@
+@@ -6112,6 +6112,10 @@
      uint  *idx_end_p;
  
      alter_flags= table->file->alter_table_flags(alter_info->flags);
@@ -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
-@@ -2150,6 +2150,13 @@
+@@ -2186,6 +2186,13 @@
         GLOBAL_VAR(opt_optimizer_fix),
         NO_CMD_LINE, DEFAULT(TRUE));
  

================================================================
Index: packages/mysql/innodb_adaptive_hash_index_partitions.patch
diff -u packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.5 packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.6
--- packages/mysql/innodb_adaptive_hash_index_partitions.patch:1.5	Thu Apr 28 10:02:36 2011
+++ packages/mysql/innodb_adaptive_hash_index_partitions.patch	Sat Jun 25 17:06:50 2011
@@ -262,7 +262,7 @@
  }
  
  /*****************************************************************//**
-@@ -195,11 +211,20 @@
+@@ -195,11 +211,22 @@
  btr_search_sys_free(void)
  /*=====================*/
  {
@@ -281,6 +281,8 @@
 +
 +		mem_free(btr_search_latch_part[i]);
 +	}
++	mem_free(btr_search_sys->hash_index);
++	mem_free(btr_search_latch_part);
 +
 +	//rw_lock_free(&btr_search_latch);
 +	//mem_free(btr_search_latch_temp);
@@ -288,7 +290,7 @@
  	mem_free(btr_search_sys);
  	btr_search_sys = NULL;
  }
-@@ -212,7 +237,7 @@
+@@ -212,7 +239,7 @@
  /*====================*/
  {
  	mutex_enter(&btr_search_enabled_mutex);
@@ -297,7 +299,7 @@
  
  	/* Disable access to hash index, also tell ha_insert_for_fold()
  	stop adding new nodes to hash index, but still allow updating
-@@ -230,7 +255,7 @@
+@@ -230,7 +257,7 @@
  	/* btr_search_enabled_mutex should guarantee this. */
  	ut_ad(!btr_search_enabled);
  
@@ -306,7 +308,7 @@
  	mutex_exit(&btr_search_enabled_mutex);
  }
  
-@@ -242,12 +267,12 @@
+@@ -242,12 +269,12 @@
  /*====================*/
  {
  	mutex_enter(&btr_search_enabled_mutex);
@@ -321,7 +323,7 @@
  	mutex_exit(&btr_search_enabled_mutex);
  }
  
-@@ -300,20 +325,21 @@
+@@ -300,20 +327,21 @@
  ulint
  btr_search_info_get_ref_count(
  /*==========================*/
@@ -348,7 +350,7 @@
  
  	return(ret);
  }
-@@ -334,8 +360,8 @@
+@@ -334,8 +362,8 @@
  	int		cmp;
  
  #ifdef UNIV_SYNC_DEBUG
@@ -359,7 +361,7 @@
  #endif /* UNIV_SYNC_DEBUG */
  
  	index = cursor->index;
-@@ -453,8 +479,8 @@
+@@ -453,8 +481,8 @@
  				/*!< in: cursor */
  {
  #ifdef UNIV_SYNC_DEBUG
@@ -370,7 +372,7 @@
  	ut_ad(rw_lock_own(&block->lock, RW_LOCK_SHARED)
  	      || rw_lock_own(&block->lock, RW_LOCK_EX));
  #endif /* UNIV_SYNC_DEBUG */
-@@ -538,7 +564,7 @@
+@@ -538,7 +566,7 @@
  
  	ut_ad(cursor->flag == BTR_CUR_HASH_FAIL);
  #ifdef UNIV_SYNC_DEBUG
@@ -379,7 +381,7 @@
  	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)
  	      || rw_lock_own(&(block->lock), RW_LOCK_EX));
  #endif /* UNIV_SYNC_DEBUG */
-@@ -578,10 +604,10 @@
+@@ -578,10 +606,10 @@
  			mem_heap_free(heap);
  		}
  #ifdef UNIV_SYNC_DEBUG
@@ -392,7 +394,7 @@
  				   block, rec);
  	}
  }
-@@ -601,8 +627,8 @@
+@@ -601,8 +629,8 @@
  	ulint*		params2;
  
  #ifdef UNIV_SYNC_DEBUG
@@ -403,7 +405,7 @@
  #endif /* UNIV_SYNC_DEBUG */
  
  	block = btr_cur_get_block(cursor);
-@@ -623,7 +649,7 @@
+@@ -623,7 +651,7 @@
  
  	if (build_index || (cursor->flag == BTR_CUR_HASH_FAIL)) {
  
@@ -412,7 +414,7 @@
  	}
  
  	if (cursor->flag == BTR_CUR_HASH_FAIL) {
-@@ -633,11 +659,11 @@
+@@ -633,11 +661,11 @@
  		btr_search_n_hash_fail++;
  #endif /* UNIV_SEARCH_PERF_STAT */
  
@@ -426,7 +428,7 @@
  	}
  
  	if (build_index) {
-@@ -881,17 +907,17 @@
+@@ -881,17 +909,17 @@
  	cursor->flag = BTR_CUR_HASH;
  
  	if (UNIV_LIKELY(!has_search_latch)) {
@@ -448,7 +450,7 @@
  
  	if (UNIV_UNLIKELY(!rec)) {
  		goto failure_unlock;
-@@ -909,7 +935,7 @@
+@@ -909,7 +937,7 @@
  			goto failure_unlock;
  		}
  
@@ -457,7 +459,7 @@
  
  		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);
  	}
-@@ -1006,7 +1032,7 @@
+@@ -1006,7 +1034,7 @@
  	/*-------------------------------------------*/
  failure_unlock:
  	if (UNIV_LIKELY(!has_search_latch)) {
@@ -466,7 +468,7 @@
  	}
  failure:
  	cursor->flag = BTR_CUR_HASH_FAIL;
-@@ -1029,10 +1055,11 @@
+@@ -1029,10 +1057,11 @@
  void
  btr_search_drop_page_hash_index(
  /*============================*/
@@ -479,7 +481,7 @@
  {
  	hash_table_t*		table;
  	ulint			n_fields;
-@@ -1051,22 +1078,60 @@
+@@ -1051,22 +1080,60 @@
  	ulint*			offsets;
  
  #ifdef UNIV_SYNC_DEBUG
@@ -514,7 +516,7 @@
 +		}
 +		if (UNIV_LIKELY(!block->is_hashed)) {
 +			rw_lock_s_unlock(btr_search_latch);
-+			return;
++			goto retry;
 +		}
 +		index = block->index;
 +		ut_a(btr_search_latch == btr_search_get_latch(index->id));
@@ -545,7 +547,7 @@
  
  #ifdef UNIV_SYNC_DEBUG
  	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)
-@@ -1076,14 +1141,14 @@
+@@ -1076,14 +1143,14 @@
  
  	n_fields = block->curr_n_fields;
  	n_bytes = block->curr_n_bytes;
@@ -562,7 +564,7 @@
  
  	ut_a(n_fields + n_bytes > 0);
  
-@@ -1133,7 +1198,7 @@
+@@ -1133,7 +1200,7 @@
  		mem_heap_free(heap);
  	}
  
@@ -571,7 +573,7 @@
  
  	if (UNIV_UNLIKELY(!block->is_hashed)) {
  		/* Someone else has meanwhile dropped the hash index */
-@@ -1149,7 +1214,7 @@
+@@ -1149,7 +1216,7 @@
  		/* Someone else has meanwhile built a new hash index on the
  		page, with different parameters */
  
@@ -580,7 +582,7 @@
  
  		mem_free(folds);
  		goto retry;
-@@ -1165,6 +1230,7 @@
+@@ -1165,6 +1232,7 @@
  
  	block->is_hashed = FALSE;
  	block->index = NULL;
@@ -588,7 +590,7 @@
  	
  cleanup:
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
-@@ -1177,14 +1243,14 @@
+@@ -1177,14 +1245,14 @@
  			"InnoDB: the hash index to a page of %s,"
  			" still %lu hash nodes remain.\n",
  			index->name, (ulong) block->n_pointers);
@@ -606,7 +608,7 @@
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
  
  	mem_free(folds);
-@@ -1216,9 +1282,9 @@
+@@ -1216,9 +1284,9 @@
  	ulint*		offsets;
  	ibool		released_search_latch;
  
@@ -618,7 +620,7 @@
  
  	for (j = 0; j < srv_buf_pool_instances; j++) {
  		buf_pool_t*	buf_pool;
-@@ -1252,7 +1318,7 @@
+@@ -1252,7 +1320,7 @@
  
  
  					/* keeping latch order */
@@ -627,7 +629,7 @@
  					released_search_latch = TRUE;
  					rw_lock_x_lock(&block->lock);
  
-@@ -1304,7 +1370,7 @@
+@@ -1304,7 +1372,7 @@
  						mem_heap_empty(heap);
  					}
  
@@ -636,7 +638,7 @@
  
  					if (UNIV_UNLIKELY(!block->is_hashed)) {
  						goto cleanup;
-@@ -1314,12 +1380,12 @@
+@@ -1314,12 +1382,12 @@
  
  					if (UNIV_UNLIKELY(block->curr_n_fields != n_fields)
  					    || UNIV_UNLIKELY(block->curr_n_bytes != n_bytes)) {
@@ -651,7 +653,7 @@
  						goto retry;
  					}
  
-@@ -1333,6 +1399,7 @@
+@@ -1333,6 +1401,7 @@
  
  					block->is_hashed = FALSE;
  					block->index = NULL;
@@ -659,7 +661,7 @@
  
  cleanup:
  #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
-@@ -1345,18 +1412,18 @@
+@@ -1345,18 +1414,18 @@
  							index->name, (ulong) block->n_pointers);
  					}
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
@@ -681,7 +683,7 @@
  
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
-@@ -1403,7 +1470,7 @@
+@@ -1403,7 +1472,7 @@
  
  		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);
  
@@ -690,7 +692,7 @@
  	}
  
  	mtr_commit(&mtr);
-@@ -1445,26 +1512,26 @@
+@@ -1445,26 +1514,26 @@
  	ut_ad(index);
  	ut_a(!dict_index_is_ibuf(index));
  
@@ -723,7 +725,7 @@
  	}
  
  	n_recs = page_get_n_recs(page);
-@@ -1558,9 +1625,9 @@
+@@ -1558,9 +1627,9 @@
  		fold = next_fold;
  	}
  
@@ -735,7 +737,7 @@
  
  	if (UNIV_UNLIKELY(btr_search_fully_disabled)) {
  		goto exit_func;
-@@ -1588,6 +1655,7 @@
+@@ -1588,6 +1657,7 @@
  	block->curr_n_bytes = n_bytes;
  	block->curr_left_side = left_side;
  	block->index = index;
@@ -743,7 +745,7 @@
  
  	for (i = 0; i < n_cached; i++) {
  
-@@ -1595,7 +1663,7 @@
+@@ -1595,7 +1665,7 @@
  	}
  
  exit_func:
@@ -752,7 +754,7 @@
  
  	mem_free(folds);
  	mem_free(recs);
-@@ -1634,13 +1702,13 @@
+@@ -1634,13 +1704,13 @@
  	ut_a(!(new_block->is_hashed || block->is_hashed)
  	     || !dict_index_is_ibuf(index));
  
@@ -769,7 +771,7 @@
  
  		return;
  	}
-@@ -1655,7 +1723,7 @@
+@@ -1655,7 +1725,7 @@
  		new_block->n_bytes = block->curr_n_bytes;
  		new_block->left_side = left_side;
  
@@ -778,7 +780,7 @@
  
  		ut_a(n_fields + n_bytes > 0);
  
-@@ -1667,7 +1735,7 @@
+@@ -1667,7 +1737,7 @@
  		return;
  	}
  
@@ -787,7 +789,7 @@
  }
  
  /********************************************************************//**
-@@ -1706,7 +1774,7 @@
+@@ -1706,7 +1776,7 @@
  	ut_a(block->curr_n_fields + block->curr_n_bytes > 0);
  	ut_a(!dict_index_is_ibuf(cursor->index));
  
@@ -796,7 +798,7 @@
  
  	index_id = cursor->index->id;
  	fold = rec_fold(rec, rec_get_offsets(rec, cursor->index, offsets_,
-@@ -1715,11 +1783,11 @@
+@@ -1715,11 +1785,11 @@
  	if (UNIV_LIKELY_NULL(heap)) {
  		mem_heap_free(heap);
  	}
@@ -810,7 +812,7 @@
  }
  
  /********************************************************************//**
-@@ -1753,21 +1821,21 @@
+@@ -1753,21 +1823,21 @@
  	ut_a(block->index == cursor->index);
  	ut_a(!dict_index_is_ibuf(cursor->index));
  
@@ -836,7 +838,7 @@
  
  		btr_search_update_hash_on_insert(cursor);
  	}
-@@ -1802,9 +1870,9 @@
+@@ -1802,9 +1872,9 @@
  	ulint*		offsets		= offsets_;
  	rec_offs_init(offsets_);
  
@@ -848,7 +850,7 @@
  
  	rec = btr_cur_get_rec(cursor);
  
-@@ -1849,7 +1917,7 @@
+@@ -1849,7 +1919,7 @@
  	} else {
  		if (left_side) {
  
@@ -857,7 +859,7 @@
  
  			locked = TRUE;
  
-@@ -1863,7 +1931,7 @@
+@@ -1863,7 +1933,7 @@
  
  		if (!locked) {
  
@@ -866,7 +868,7 @@
  
  			locked = TRUE;
  		}
-@@ -1881,7 +1949,7 @@
+@@ -1881,7 +1951,7 @@
  		if (!left_side) {
  
  			if (!locked) {
@@ -875,7 +877,7 @@
  
  				locked = TRUE;
  			}
-@@ -1896,7 +1964,7 @@
+@@ -1896,7 +1966,7 @@
  
  		if (!locked) {
  
@@ -884,7 +886,7 @@
  
  			locked = TRUE;
  		}
-@@ -1919,7 +1987,7 @@
+@@ -1919,7 +1989,7 @@
  		mem_heap_free(heap);
  	}
  	if (locked) {
@@ -893,7 +895,7 @@
  	}
  }
  
-@@ -1935,7 +2003,7 @@
+@@ -1935,7 +2005,7 @@
  	ha_node_t*	node;
  	ulint		n_page_dumps	= 0;
  	ibool		ok		= TRUE;
@@ -902,7 +904,7 @@
  	ulint		cell_count;
  	mem_heap_t*	heap		= NULL;
  	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
-@@ -1947,23 +2015,25 @@
+@@ -1947,23 +2017,25 @@
  
  	rec_offs_init(offsets_);
  
@@ -933,7 +935,7 @@
  
  		for (; node != NULL; node = node->next) {
  			const buf_block_t*	block
-@@ -2072,19 +2142,21 @@
+@@ -2072,19 +2144,21 @@
  		give other queries a chance to run. */
  		if (i != 0) {
  			buf_pool_page_hash_x_unlock_all();
@@ -970,7 +972,7 @@
  
  	block->is_hashed = FALSE;
  
-@@ -1477,7 +1478,7 @@
+@@ -1481,7 +1482,7 @@
  			/* To follow the latching order, we
  			have to release btr_search_latch
  			before acquiring block->latch. */
@@ -979,21 +981,21 @@
  			/* When we release the search latch,
  			we must rescan all blocks, because
  			some may become hashed again. */
-@@ -1508,11 +1509,11 @@
+@@ -1512,11 +1513,11 @@
  			anything.  block->is_hashed can only
  			be set on uncompressed file pages. */
- 			
+ 
 -			btr_search_drop_page_hash_index(block);
 +			btr_search_drop_page_hash_index(block, NULL);
- 			
+ 
  			rw_lock_x_unlock(&block->lock);
- 			
+ 
 -			rw_lock_x_lock(&btr_search_latch);
 +			btr_search_x_lock_all();
- 			
+ 
  			ut_ad(!btr_search_enabled);
  		}
-@@ -1531,7 +1532,11 @@
+@@ -1535,7 +1536,11 @@
  	ibool		released_search_latch;
  
  #ifdef UNIV_SYNC_DEBUG
@@ -1017,7 +1019,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
-@@ -1776,7 +1776,7 @@
+@@ -1798,7 +1798,7 @@
  
  		UNIV_MEM_VALID(((buf_block_t*) bpage)->frame,
  			       UNIV_PAGE_SIZE);
@@ -1029,7 +1031,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
-@@ -1812,7 +1812,7 @@
+@@ -1811,7 +1811,7 @@
  	zero. */
  
  	for (;;) {
@@ -1054,19 +1056,19 @@
 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
-@@ -11682,6 +11682,11 @@
+@@ -11702,6 +11702,11 @@
    "Disable with --skip-innodb-adaptive-hash-index.",
    NULL, innodb_adaptive_hash_index_update, TRUE);
  
 +static MYSQL_SYSVAR_ULONG(adaptive_hash_index_partitions, btr_search_index_num,
 +  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
 +  "Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)",
-+  NULL, NULL, 1, 1, 32, 0);
++  NULL, NULL, 1, 1, sizeof(ulint) * 8, 0);
 +
  static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,
    PLUGIN_VAR_RQCMDARG,
    "Replication thread delay (ms) on the slave server if "
-@@ -12047,6 +12052,7 @@
+@@ -12068,6 +12073,7 @@
    MYSQL_SYSVAR(use_sys_stats_table),
    MYSQL_SYSVAR(stats_sample_pages),
    MYSQL_SYSVAR(adaptive_hash_index),
@@ -1262,7 +1264,7 @@
 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
-@@ -1545,7 +1545,7 @@
+@@ -1546,7 +1546,7 @@
  					pointers in the adaptive hash index
  					pointing to this frame */
  #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
@@ -1271,7 +1273,7 @@
  					already been built on this
  					page; note that it does not
  					guarantee that the index is
-@@ -1559,6 +1559,7 @@
+@@ -1560,6 +1560,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. */
@@ -1315,7 +1317,7 @@
 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
-@@ -4445,7 +4445,7 @@
+@@ -4444,7 +4444,7 @@
  
  #ifndef UNIV_HOTBACKUP
  	temp_block = buf_block_alloc(buf_pool);
@@ -1387,7 +1389,7 @@
  #ifdef UNIV_SEARCH_DEBUG
  	ulint		cnt				= 0;
  #endif /* UNIV_SEARCH_DEBUG */
-@@ -3441,18 +3443,32 @@
<<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.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_adaptive_hash_index_partitions.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_admin_command_base.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_pages_i_s.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_buffer_pool_shm.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_deadlock_count.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_dict_size_limit.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_fast_index_creation.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_expand_import.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extend_slow.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_extra_rseg.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fast_checksum.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_files_extend.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_fix_misc.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_io_patches.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_lru_dump_restore.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_opt_lru_count.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_overwrite_relay_log_info.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_pass_corrupt_table.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_recovery_patches.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_separate_doublewrite.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_lock_name.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_status_extend.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_show_sys_tables.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_split_buf_pool_mutex.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_stats.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/innodb_thread_concurrency_timer_based.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_connection_error.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/log_warnings_suppress.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/microsec_process.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.550&r2=1.551&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_dump_ignore_ct.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_remove_eol_carret.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_syslog.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/optimizer_fix.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/percona_support.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/processlist_row_stats.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/query_cache_enhance.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/response_time_distribution.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_slave_status_nolock.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/show_temp.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/slow_extended.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/sql_no_fcache.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/userstat.patch?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list