packages: mysql/innodb_io_patches.patch, mysql/innodb_pass_corrupt_table.pa...

arekm arekm at pld-linux.org
Sat Apr 14 10:51:58 CEST 2012


Author: arekm                        Date: Sat Apr 14 08:51:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.5.21

---- Files affected:
packages/mysql:
   innodb_io_patches.patch (1.11 -> 1.12) , innodb_pass_corrupt_table.patch (1.13 -> 1.14) , mysql.spec (1.569 -> 1.570) , mysql_dump_ignore_ct.patch (1.5 -> 1.6) , query_cache_enhance.patch (1.13 -> 1.14) , utf8_general50_ci.patch (1.1 -> 1.2) , warning_fixes.patch (1.2 -> 1.3) , bug54330.patch (NONE -> 1.1)  (NEW), bug933969.patch (NONE -> 1.1)  (NEW), bug966844_page_size_error_on_5520_upgrade.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql/innodb_io_patches.patch
diff -u packages/mysql/innodb_io_patches.patch:1.11 packages/mysql/innodb_io_patches.patch:1.12
--- packages/mysql/innodb_io_patches.patch:1.11	Thu Feb 16 17:26:12 2012
+++ packages/mysql/innodb_io_patches.patch	Sat Apr 14 10:51:52 2012
@@ -117,29 +117,6 @@
  	}
  
  	return(count);
-@@ -1940,6 +1988,22 @@
- 
- 		buf_pool = buf_pool_from_array(i);
- 
-+		if (lsn_limit != IB_ULONGLONG_MAX) {
-+			buf_page_t*	bpage;
-+
-+			buf_flush_list_mutex_enter(buf_pool);
-+			bpage = UT_LIST_GET_LAST(buf_pool->flush_list);
-+			if (!bpage
-+			    || bpage->oldest_modification >= lsn_limit) {
-+
-+				buf_flush_list_mutex_exit(buf_pool);
-+				continue;
-+			} else {
-+
-+				buf_flush_list_mutex_exit(buf_pool);
-+			}
-+		}
-+
- 		if (!buf_flush_start(buf_pool, BUF_FLUSH_LIST)) {
- 			/* We have two choices here. If lsn_limit was
- 			specified then skipping an instance of buffer
 --- a/storage/innobase/buf/buf0rea.c
 +++ b/storage/innobase/buf/buf0rea.c
 @@ -427,6 +427,10 @@
@@ -315,7 +292,7 @@
  
  static MYSQL_SYSVAR_LONG(buffer_pool_instances, innobase_buffer_pool_instances,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-@@ -11450,6 +11476,135 @@
+@@ -11442,6 +11468,127 @@
    "trigger a readahead.",
    NULL, NULL, 56, 0, 64, 0);
  
@@ -440,18 +417,10 @@
 +  "Choose method of innodb_adaptive_flushing. (native, [estimate], keep_average)",
 +  NULL, innodb_adaptive_flushing_method_update, 1, &adaptive_flushing_method_typelib);
 +
-+#ifdef UNIV_DEBUG
-+static MYSQL_SYSVAR_ULONG(flush_checkpoint_debug, srv_flush_checkpoint_debug,
-+  PLUGIN_VAR_RQCMDARG,
-+  "Debug flags for InnoDB flushing and checkpointing (0=none,"
-+  "1=stop preflush and checkpointing)",
-+  NULL, NULL, 0, 0, 1, 0);
-+#endif
-+
  static struct st_mysql_sys_var* innobase_system_variables[]= {
    MYSQL_SYSVAR(additional_mem_pool_size),
    MYSQL_SYSVAR(autoextend_increment),
-@@ -11470,6 +11625,7 @@
+@@ -11462,6 +11609,7 @@
    MYSQL_SYSVAR(file_format_check),
    MYSQL_SYSVAR(file_format_max),
    MYSQL_SYSVAR(flush_log_at_trx_commit),
@@ -459,7 +428,7 @@
    MYSQL_SYSVAR(flush_method),
    MYSQL_SYSVAR(force_recovery),
    MYSQL_SYSVAR(large_prefix),
-@@ -11509,6 +11665,13 @@
+@@ -11501,6 +11649,13 @@
    MYSQL_SYSVAR(show_verbose_locks),
    MYSQL_SYSVAR(show_locks_held),
    MYSQL_SYSVAR(version),
@@ -473,16 +442,6 @@
    MYSQL_SYSVAR(use_sys_malloc),
    MYSQL_SYSVAR(use_native_aio),
    MYSQL_SYSVAR(change_buffering),
-@@ -11521,6 +11684,9 @@
-   MYSQL_SYSVAR(purge_threads),
-   MYSQL_SYSVAR(purge_batch_size),
-   MYSQL_SYSVAR(rollback_segments),
-+#ifdef UNIV_DEBUG
-+  MYSQL_SYSVAR(flush_checkpoint_debug),
-+#endif
-   NULL
- };
- 
 --- a/storage/innobase/ibuf/ibuf0ibuf.c
 +++ b/storage/innobase/ibuf/ibuf0ibuf.c
 @@ -523,8 +523,10 @@
@@ -639,17 +598,7 @@
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
-@@ -255,6 +266,9 @@
- extern	ibool	srv_print_buf_io;
- extern	ibool	srv_print_log_io;
- extern	ibool	srv_print_latch_waits;
-+
-+extern	ulint	srv_flush_checkpoint_debug;
-+
- #else /* UNIV_DEBUG */
- # define srv_print_thread_releases	FALSE
- # define srv_print_lock_waits		FALSE
-@@ -399,8 +413,9 @@
+@@ -399,8 +410,9 @@
  				when writing data files, but do flush
  				after writing to log files */
  	SRV_UNIX_NOSYNC,	/*!< do not flush after writing */
@@ -769,84 +718,20 @@
  		log_sys->flushed_to_disk_lsn = log_sys->write_lsn;
  	}
  
-@@ -1655,10 +1686,13 @@
- 		recv_apply_hashed_log_recs(TRUE);
- 	}
- 
-+ retry:
- 	n_pages = buf_flush_list(ULINT_MAX, new_oldest);
- 
--	if (sync) {
--		buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
-+	if (sync && n_pages != 0) {
-+		//buf_flush_wait_batch_end(NULL, BUF_FLUSH_LIST);
-+		os_thread_sleep(100000);
-+		goto retry;
- 	}
- 
- 	if (n_pages == ULINT_UNDEFINED) {
-@@ -1979,6 +2013,13 @@
- {
- 	ib_uint64_t	oldest_lsn;
- 
-+#ifdef UNIV_DEBUG
-+	if (srv_flush_checkpoint_debug == 1) {
-+
-+		return TRUE;
-+	}
-+#endif
-+
- 	if (recv_recovery_is_on()) {
- 		recv_apply_hashed_log_recs(TRUE);
- 	}
-@@ -2070,7 +2111,11 @@
- 					physical write will always be made to
- 					log files */
- {
--	/* Preflush pages synchronously */
-+#ifdef UNIV_DEBUG
-+	if (srv_flush_checkpoint_debug == 1)
-+		return;
-+#endif
-+/* Preflush pages synchronously */
- 
- 	while (!log_preflush_pool_modified_pages(lsn, TRUE));
- 
-@@ -2096,7 +2141,13 @@
- 	ibool		checkpoint_sync;
- 	ibool		do_checkpoint;
- 	ibool		success;
--loop:
-+
-+#ifdef UNIV_DEBUG
-+	if (srv_flush_checkpoint_debug == 1)
-+		return;
-+#endif
-+
-+ loop:
- 	sync = FALSE;
- 	checkpoint_sync = FALSE;
- 	do_checkpoint = FALSE;
-@@ -2119,13 +2170,15 @@
- 		/* A flush is urgent: we have to do a synchronous preflush */
+@@ -2120,10 +2151,10 @@
  
  		sync = TRUE;
--		advance = 2 * (age - log->max_modified_age_sync);
+ 		advance = 2 * (age - log->max_modified_age_sync);
 -	} else if (age > log->max_modified_age_async) {
-+		advance = age - log->max_modified_age_sync;
 +	} else if (age > log_max_modified_age_async()) {
  
  		/* A flush is not urgent: we do an asynchronous preflush */
 -		advance = age - log->max_modified_age_async;
 +		advance = age - log_max_modified_age_async();
-+		log->check_flush_or_checkpoint = FALSE;
  	} else {
  		advance = 0;
-+		log->check_flush_or_checkpoint = FALSE;
  	}
- 
- 	checkpoint_age = log->lsn - log->last_checkpoint_lsn;
-@@ -2137,14 +2190,14 @@
+@@ -2137,7 +2168,7 @@
  
  		do_checkpoint = TRUE;
  
@@ -855,33 +740,7 @@
  		/* A checkpoint is not urgent: do it asynchronously */
  
  		do_checkpoint = TRUE;
- 
--		log->check_flush_or_checkpoint = FALSE;
-+		//log->check_flush_or_checkpoint = FALSE;
- 	} else {
--		log->check_flush_or_checkpoint = FALSE;
-+		//log->check_flush_or_checkpoint = FALSE;
- 	}
- 
- 	mutex_exit(&(log->mutex));
-@@ -2152,6 +2205,7 @@
- 	if (advance) {
- 		ib_uint64_t	new_oldest = oldest_lsn + advance;
- 
-+retry:
- 		success = log_preflush_pool_modified_pages(new_oldest, sync);
- 
- 		/* If the flush succeeded, this thread has done its part
-@@ -2166,7 +2220,7 @@
- 			log->check_flush_or_checkpoint = TRUE;
- 
- 			mutex_exit(&(log->mutex));
--			goto loop;
-+			goto retry;
- 		}
- 	}
- 
-@@ -2607,7 +2661,7 @@
+@@ -2607,7 +2638,7 @@
  
  	mutex_exit(&(log_sys->mutex));
  
@@ -890,20 +749,7 @@
  
  	mutex_enter(&(log_sys->mutex));
  
-@@ -3044,7 +3098,11 @@
- log_check_margins(void)
- /*===================*/
- {
--loop:
-+#ifdef UNIV_DEBUG
-+	if (srv_flush_checkpoint_debug == 1)
-+		return;
-+#endif
-+ loop:
- 	log_flush_margin();
- 
- 	log_checkpoint_margin();
-@@ -3349,6 +3407,17 @@
+@@ -3349,6 +3380,17 @@
  		log_sys->flushed_to_disk_lsn,
  		log_sys->last_checkpoint_lsn);
  
@@ -1130,17 +976,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -417,6 +429,9 @@
- UNIV_INTERN ibool	srv_print_buf_io		= FALSE;
- UNIV_INTERN ibool	srv_print_log_io		= FALSE;
- UNIV_INTERN ibool	srv_print_latch_waits		= FALSE;
-+
-+UNIV_INTERN ulong	srv_flush_checkpoint_debug = 0;
-+
- #endif /* UNIV_DEBUG */
- 
- UNIV_INTERN ulint		srv_n_rows_inserted		= 0;
-@@ -2713,7 +2728,7 @@
+@@ -2713,7 +2725,7 @@
  
  	ut_ad(!mutex_own(&kernel_mutex));
  
@@ -1149,7 +985,7 @@
  
  	do {
  		/* Check for shutdown and change in purge config. */
-@@ -2746,6 +2761,7 @@
+@@ -2746,6 +2758,7 @@
  	ulint		n_pages_purged	= 0;
  	ulint		n_bytes_merged;
  	ulint		n_pages_flushed;
@@ -1157,7 +993,7 @@
  	ulint		n_bytes_archived;
  	ulint		n_tables_to_drop;
  	ulint		n_ios;
-@@ -2753,7 +2769,20 @@
+@@ -2753,7 +2766,20 @@
  	ulint		n_ios_very_old;
  	ulint		n_pend_ios;
  	ulint		next_itr_time;
@@ -1178,7 +1014,7 @@
  
  #ifdef UNIV_DEBUG_THREAD_CREATION
  	fprintf(stderr, "Master thread starts, id %lu\n",
-@@ -2775,6 +2804,9 @@
+@@ -2775,6 +2801,9 @@
  
  	mutex_exit(&kernel_mutex);
  
@@ -1188,7 +1024,7 @@
  loop:
  	/*****************************************************************/
  	/* ---- When there is database activity by users, we cycle in this
-@@ -2805,9 +2837,13 @@
+@@ -2805,9 +2834,13 @@
  	/* Sleep for 1 second on entrying the for loop below the first time. */
  	next_itr_time = ut_time_ms() + 1000;
  
@@ -1202,7 +1038,7 @@
  		/* ALTER TABLE in MySQL requires on Unix that the table handler
  		can drop tables lazily after there no longer are SELECT
  		queries to them. */
-@@ -2831,6 +2867,7 @@
+@@ -2831,6 +2864,7 @@
  		srv_main_thread_op_info = "sleeping";
  		srv_main_1_second_loops++;
  
@@ -1210,7 +1046,7 @@
  		if (next_itr_time > cur_time
  		    && srv_shutdown_state == SRV_SHUTDOWN_NONE) {
  
-@@ -2841,10 +2878,26 @@
+@@ -2841,10 +2875,26 @@
  					(next_itr_time - cur_time)
  					 * 1000));
  			srv_main_sleeps++;
@@ -1237,7 +1073,7 @@
  
  		/* Flush logs if needed */
  		srv_sync_log_buffer_in_background();
-@@ -2864,7 +2917,7 @@
+@@ -2864,7 +2914,7 @@
  		if (n_pend_ios < SRV_PEND_IO_THRESHOLD
  		    && (n_ios - n_ios_old < SRV_RECENT_IO_ACTIVITY)) {
  			srv_main_thread_op_info = "doing insert buffer merge";
@@ -1246,7 +1082,7 @@
  
  			/* Flush logs if needed */
  			srv_sync_log_buffer_in_background();
-@@ -2881,7 +2934,11 @@
+@@ -2881,7 +2931,11 @@
  			n_pages_flushed = buf_flush_list(
  				PCT_IO(100), IB_ULONGLONG_MAX);
  
@@ -1259,7 +1095,7 @@
  
  			/* Try to keep the rate of flushing of dirty
  			pages such that redo log generation does not
-@@ -2897,6 +2954,224 @@
+@@ -2897,6 +2951,224 @@
  						n_flush,
  						IB_ULONGLONG_MAX);
  			}
@@ -1484,7 +1320,7 @@
  		}
  
  		if (srv_activity_count == old_activity_count) {
-@@ -2945,12 +3220,12 @@
+@@ -2945,12 +3217,12 @@
  	even if the server were active */
  
  	srv_main_thread_op_info = "doing insert buffer merge";
@@ -1499,29 +1335,7 @@
  		srv_main_thread_op_info = "master purging";
  
  		srv_master_do_purge();
-@@ -2982,11 +3257,18 @@
- 			  PCT_IO(10), IB_ULONGLONG_MAX);
- 	}
- 
--	srv_main_thread_op_info = "making checkpoint";
-+#ifdef UNIV_DEBUG
-+	if (srv_flush_checkpoint_debug != 1) {
-+#endif
- 
--	/* Make a new checkpoint about once in 10 seconds */
-+		srv_main_thread_op_info = "making checkpoint";
- 
--	log_checkpoint(TRUE, FALSE);
-+		/* Make a new checkpoint about once in 10 seconds */
-+
-+		log_checkpoint(TRUE, FALSE);
-+#ifdef UNIV_DEBUG
-+	}
-+#endif
- 
- 	srv_main_thread_op_info = "reserving kernel mutex";
- 
-@@ -3028,7 +3310,7 @@
+@@ -3028,7 +3300,7 @@
  		}
  	}
  
@@ -1530,7 +1344,7 @@
  		srv_main_thread_op_info = "master purging";
  
  		srv_master_do_purge();
-@@ -3053,7 +3335,7 @@
+@@ -3053,7 +3325,7 @@
  		buf_flush_list below. Otherwise, the system favors
  		clean pages over cleanup throughput. */
  		n_bytes_merged = ibuf_contract_for_n_pages(FALSE,
@@ -1539,28 +1353,7 @@
  	}
  
  	srv_main_thread_op_info = "reserving kernel mutex";
-@@ -3065,6 +3347,10 @@
- 	}
- 	mutex_exit(&kernel_mutex);
- 
-+#ifdef UNIV_DEBUG
-+	if (srv_flush_checkpoint_debug == 1)
-+		goto skip_flush;
-+#endif
- flush_loop:
- 	srv_main_thread_op_info = "flushing buffer pool pages";
- 	srv_main_flush_loops++;
-@@ -3105,6 +3391,9 @@
- 		goto flush_loop;
- 	}
- 
-+#ifdef UNIV_DEBUG
-+skip_flush:
-+#endif
- 	srv_main_thread_op_info = "reserving kernel mutex";
- 
- 	mutex_enter(&kernel_mutex);
-@@ -3193,6 +3482,7 @@
+@@ -3193,6 +3465,7 @@
  	srv_slot_t*	slot;
  	ulint		retries = 0;
  	ulint		n_total_purged = ULINT_UNDEFINED;
@@ -1568,7 +1361,7 @@
  
  	ut_a(srv_n_purge_threads == 1);
  
-@@ -3213,9 +3503,12 @@
+@@ -3213,9 +3486,12 @@
  
  	mutex_exit(&kernel_mutex);
  
@@ -1581,7 +1374,7 @@
  
  		/* If there are very few records to purge or the last
  		purge didn't purge any records then wait for activity.
-@@ -3262,6 +3555,16 @@
+@@ -3262,6 +3538,16 @@
  		} while (n_pages_purged > 0 && !srv_fast_shutdown);
  
  		srv_sync_log_buffer_in_background();
@@ -1829,103 +1622,6 @@
 +# SHOW GLOBAL STATUS LIKE 'Innodb_buffer_pool_pages_flushed';
 +
 +DROP TABLE t1;
---- /dev/null
-+++ b/mysql-test/suite/innodb/r/percona_sync_flush.result
-@@ -0,0 +1,35 @@
-+DROP TABLE IF EXISTS t1;
-+CREATE TABLE t1 (id INT AUTO_INCREMENT, foo CHAR(255), PRIMARY KEY (id)) ENGINE=InnoDB;
-+SET @@global.innodb_flush_checkpoint_debug=1;
-+INSERT INTO t1(foo) VALUES ('a'), ('b');
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+INSERT INTO t1(foo) SELECT foo FROM t1;
-+UPDATE t1 SET foo='c';
-+SET @@global.innodb_flush_checkpoint_debug=0;
-+UPDATE t1 SET foo='d' WHERE foo='c';
-+DROP TABLE t1;
---- /dev/null
-+++ b/mysql-test/suite/innodb/t/percona_sync_flush.test
-@@ -0,0 +1,33 @@
-+# Test for InnoDB sync state flushing.
-+
-+--source include/have_innodb.inc
-+--source include/have_debug.inc
-+
-+--disable_warnings
-+DROP TABLE IF EXISTS t1;
-+--enable_warnings
-+
-+CREATE TABLE t1 (id INT AUTO_INCREMENT, foo CHAR(255), PRIMARY KEY (id)) ENGINE=InnoDB;
-+
-+# It is hard to get to InnoDB sync state flushing in MTR with regular workload.  Perhaps
-+# it is possible with many parallel connections, but that would be brittle anyway.
-+# So, just disable preflushing and checkpointing and issue simple workload.
-+SET @@global.innodb_flush_checkpoint_debug=1;
-+
-+INSERT INTO t1(foo) VALUES ('a'), ('b');
-+
-+let $rep=0;
-+while ($rep < 14)
-+{
-+        INSERT INTO t1(foo) SELECT foo FROM t1;
-+        UPDATE t1 SET foo='c';
-+        inc $rep;
-+}
-+
-+# By now checkpoint age should be well past sync flush point.  Allow
-+# preflushing/checkpointing again and do some work in order to do the sync flush.
-+SET @@global.innodb_flush_checkpoint_debug=0;
-+
-+UPDATE t1 SET foo='d' WHERE foo='c';
-+
-+DROP TABLE t1;
---- a/mysql-test/suite/sys_vars/r/all_vars.result
-+++ b/mysql-test/suite/sys_vars/r/all_vars.result
-@@ -4,6 +4,7 @@
- insert into t2 select variable_name from information_schema.global_variables;
- insert into t2 select variable_name from information_schema.session_variables;
- delete from t2 where variable_name='innodb_change_buffering_debug';
-+delete from t2 where variable_name='innodb_flush_checkpoint_debug';
- update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
- select variable_name as `There should be *no* long test name listed below:` from t2
- where length(variable_name) > 50;
---- a/mysql-test/suite/sys_vars/t/all_vars.test
-+++ b/mysql-test/suite/sys_vars/t/all_vars.test
-@@ -47,8 +47,9 @@
- insert into t2 select variable_name from information_schema.global_variables;
- insert into t2 select variable_name from information_schema.session_variables;
- 
--# This is only present in debug builds.
-+# These are only present in debug builds.
- delete from t2 where variable_name='innodb_change_buffering_debug';
-+delete from t2 where variable_name='innodb_flush_checkpoint_debug';
- 
- # Performance schema variables are too long for files named
- # 'mysql-test/suite/sys_vars/t/' ...
 --- a/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
 +++ b/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
 @@ -1 +1 @@

================================================================
Index: packages/mysql/innodb_pass_corrupt_table.patch
diff -u packages/mysql/innodb_pass_corrupt_table.patch:1.13 packages/mysql/innodb_pass_corrupt_table.patch:1.14
--- packages/mysql/innodb_pass_corrupt_table.patch:1.13	Thu Feb 16 17:26:12 2012
+++ packages/mysql/innodb_pass_corrupt_table.patch	Sat Apr 14 10:51:52 2012
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/btr/btr0btr.c
 +++ b/storage/innobase/btr/btr0btr.c
-@@ -692,6 +692,12 @@
+@@ -713,6 +713,12 @@
  
  	block = btr_block_get(space, zip_size, root_page_no, RW_X_LATCH,
  			      index, mtr);
@@ -17,10 +17,10 @@
 +	}
 +	ut_a(block);
 +
- 	ut_a((ibool)!!page_is_comp(buf_block_get_frame(block))
- 	     == dict_table_is_comp(index->table));
+ 	btr_assert_not_corrupted(block, index);
  #ifdef UNIV_BTR_DEBUG
-@@ -978,6 +984,12 @@
+ 	if (!dict_index_is_ibuf(index)) {
+@@ -998,6 +1004,12 @@
  
  	root = btr_root_get(index, &mtr);
  
@@ -33,7 +33,7 @@
  	if (flag == BTR_N_LEAF_PAGES) {
  		seg_header = root + PAGE_HEADER + PAGE_BTR_SEG_LEAF;
  
-@@ -1437,6 +1449,13 @@
+@@ -1457,6 +1469,13 @@
  
  	root = btr_page_get(space, zip_size, root_page_no, RW_X_LATCH,
  			    NULL, &mtr);
@@ -47,7 +47,7 @@
  #ifdef UNIV_BTR_DEBUG
  	ut_a(btr_root_fseg_validate(FIL_PAGE_DATA + PAGE_BTR_SEG_LEAF
  				    + root, space));
-@@ -1460,6 +1479,12 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/packages/mysql/innodb_io_patches.patch?r1=1.11&r2=1.12
    http://cvs.pld-linux.org/packages/mysql/innodb_pass_corrupt_table.patch?r1=1.13&r2=1.14
    http://cvs.pld-linux.org/packages/mysql/mysql.spec?r1=1.569&r2=1.570
    http://cvs.pld-linux.org/packages/mysql/mysql_dump_ignore_ct.patch?r1=1.5&r2=1.6
    http://cvs.pld-linux.org/packages/mysql/query_cache_enhance.patch?r1=1.13&r2=1.14
    http://cvs.pld-linux.org/packages/mysql/utf8_general50_ci.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/mysql/warning_fixes.patch?r1=1.2&r2=1.3



More information about the pld-cvs-commit mailing list