List:Commits« Previous MessageNext Message »
From:marko.makela Date:January 16 2012 12:34pm
Subject:bzr push into mysql-5.1 branch (marko.makela:3668 to 3669) Bug#13496818
View as plain text  
 3669 Marko Mäkelä	2012-01-16
      Bug#13496818 ASSERTION: REC_PAGE_NO > 4 IN IBUF CONTRACTION
      Relax a bogus debug assertion.
      Approved by Jimmy Yang on IM.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/ibuf/ibuf0ibuf.c
 3668 Nuno Carvalho	2012-01-16
      BUG#11893288 60542: RPL.RPL_EXTRA_COL_MASTER_* DOESN'T TEST WHAT WAS INTENDED
      
      Test extra/rpl_tests/rpl_extra_col_master.test (used by
      rpl_extra_col_master_*) ends with the active connection pointing to the
      slave. Thus, the two last tests never succeed in changing the binlog
      format of the master away from 'row'. With correct active connection
      (master) tests fail for binlog 'statement' and 'mixed' formats.
      
      Tests rpl_extra_col_master_* only run when binary log format is
      row.  Statement and mix replication do not make sense in this
      tests since it will try to execute statements on columns that do
      not exist.  This fix is basically a backport from mysql-5.5, see
      changes done as part of BUG 39934.

    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
      mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
=== modified file 'storage/innobase/ibuf/ibuf0ibuf.c'
--- a/storage/innobase/ibuf/ibuf0ibuf.c	revid:nuno.carvalho@strippedi52mz
+++ b/storage/innobase/ibuf/ibuf0ibuf.c	revid:marko.makela@stripped
@@ -2009,7 +2009,15 @@ ibuf_get_merge_page_nos(
 		} else {
 			rec_page_no = ibuf_rec_get_page_no(rec);
 			rec_space_id = ibuf_rec_get_space(rec);
-			ut_ad(rec_page_no > IBUF_TREE_ROOT_PAGE_NO);
+			/* In the system tablespace, the smallest
+			possible secondary index leaf page number is
+			bigger than IBUF_TREE_ROOT_PAGE_NO (4). In
+			other tablespaces, the clustered index tree is
+			created at page 3, which makes page 4 the
+			smallest possible secondary index leaf page
+			(and that only after DROP INDEX). */
+			ut_ad(rec_page_no
+			      > IBUF_TREE_ROOT_PAGE_NO - (rec_space_id != 0));
 		}
 
 #ifdef UNIV_IBUF_DEBUG

=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:nuno.carvalho@stripped
+++ b/storage/innodb_plugin/ChangeLog	revid:marko.makela@stripped0120116122203-iwn4vd7dn5azyexr
@@ -1,7 +1,12 @@
 2012-01-16	The InnoDB Team
 
+	* ibuf/ibuf0ibuf.c:
+	Fix Bug#13496818 ASSERTION: REC_PAGE_NO > 4 IN IBUF CONTRACTION
+
+2012-01-16	The InnoDB Team
+
 	* handler/ha_innodb.cc:
-	Fix Bug#11765438: 58406: ISSUES WITH COPYING PARTITIONED INNODB 
+	Fix Bug#11765438: 58406: ISSUES WITH COPYING PARTITIONED INNODB
 	TABLES FROM LINUX TO WINDOWS
 
 2012-01-04	The InnoDB Team
@@ -17,8 +22,8 @@
 2011-12-13	The InnoDB Team
 
 	* handler/ha_innodb.cc, innodb.test, innodb.result:
-	Fix Bug#13117023: InnoDB was incrementing the handler_read_key, 
-	also the SSV::ha_read_key_count, at the wrong place.   
+	Fix Bug#13117023: InnoDB was incrementing the handler_read_key,
+	also the SSV::ha_read_key_count, at the wrong place.
 
 2011-12-10	The InnoDB Team
 
@@ -279,7 +284,7 @@
 
 2011-01-06	The InnoDB Team
 	* dict/dict0dict.c, handler/ha_innodb.cc, handler/i_s.cc,
-	include/univ.i: 
+	include/univ.i:
 	Fix Bug#58643 InnoDB: too long table name
 
 2011-01-06	The InnoDB Team
@@ -545,7 +550,7 @@
 
 	* handler/ha_innodb.cc, include/row0mysql.h, row/row0mysql.c:
 	Fix Bug#53592: crash replacing duplicates into table after fast
-	alter table added unique key 
+	alter table added unique key
 
 2010-05-24	The InnoDB Team
 

=== modified file 'storage/innodb_plugin/ibuf/ibuf0ibuf.c'
--- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c	revid:nuno.carvalho@strippedqm4i52mz
+++ b/storage/innodb_plugin/ibuf/ibuf0ibuf.c	revid:marko.makela@strippedr
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2012, Oracle and/or its affiliates. All Rights Reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -2090,7 +2090,15 @@ ibuf_get_merge_page_nos(
 		} else {
 			rec_page_no = ibuf_rec_get_page_no(rec);
 			rec_space_id = ibuf_rec_get_space(rec);
-			ut_ad(rec_page_no > IBUF_TREE_ROOT_PAGE_NO);
+			/* In the system tablespace, the smallest
+			possible secondary index leaf page number is
+			bigger than IBUF_TREE_ROOT_PAGE_NO (4). In
+			other tablespaces, the clustered index tree is
+			created at page 3, which makes page 4 the
+			smallest possible secondary index leaf page
+			(and that only after DROP INDEX). */
+			ut_ad(rec_page_no
+			      > IBUF_TREE_ROOT_PAGE_NO - (rec_space_id != 0));
 		}
 
 #ifdef UNIV_IBUF_DEBUG

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1 branch (marko.makela:3668 to 3669) Bug#13496818marko.makela16 Jan