List:Commits« Previous MessageNext Message »
From:marko.makela Date:November 8 2011 7:04am
Subject:bzr push into mysql-trunk branch (marko.makela:3571 to 3572)
View as plain text  
 3572 Marko Mäkelä	2011-11-08 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
 3571 Mayank Prasad	2011-11-08
      bug#12561297 : Disabling mysql_embedded test case
      
      Innodb behavior to expect /usr/local/mysql directory, 
      causes this test case to fail. Therefore disabling it.

    modified:
      mysql-test/t/disabled.def
=== modified file 'storage/innobase/ibuf/ibuf0ibuf.c'
--- a/storage/innobase/ibuf/ibuf0ibuf.c	revid:mayank.prasad@oracle.com-20111108064003-mdyr6c1binmjo1ke
+++ b/storage/innobase/ibuf/ibuf0ibuf.c	revid:marko.makela@stripped1108070203-3sc14hk9oizioqhi
@@ -3586,8 +3586,8 @@ bitmap_fail:
 		field = dtuple_get_nth_field(
 			ibuf_entry, IBUF_REC_FIELD_METADATA);
 		mach_write_to_2(
-			dfield_get_data(field) + IBUF_REC_OFFSET_COUNTER,
-			counter);
+			(byte*) dfield_get_data(field)
+			+ IBUF_REC_OFFSET_COUNTER, counter);
 	}
 
 	/* Set the bitmap bit denoting that the insert buffer contains

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3571 to 3572) marko.makela11 Nov