bzr push into mysql-trunk branch (jorgen.loland:3795 to 3796)

[Jorgen Loland]

 3796 Jorgen Loland	2012-01-26 [merge]
      Merge 5.5 to trunk

    modified:
      storage/innobase/ibuf/ibuf0ibuf.cc
 3795 Marko Mäkelä	2012-01-26 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0cur.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/mtr0log.ic
      storage/innobase/lock/lock0lock.cc
      storage/innobase/page/page0page.cc
      storage/innobase/row/row0ins.cc
      storage/innobase/row/row0sel.cc
      storage/innobase/row/row0umod.cc
      storage/innobase/row/row0upd.cc
      storage/innobase/srv/srv0srv.cc
      storage/innobase/trx/trx0purge.cc
      storage/innobase/trx/trx0rec.cc
=== modified file 'storage/innobase/ibuf/ibuf0ibuf.cc'
--- a/storage/innobase/ibuf/ibuf0ibuf.cc	2012-01-26 11:57:53 +0000
+++ b/storage/innobase/ibuf/ibuf0ibuf.cc	2012-01-26 12:31:26 +0000
@@ -3967,7 +3967,7 @@ ibuf_set_del_mark(
 			(unsigned) buf_block_get_space(block),
 			(unsigned) buf_block_get_page_no(block),
 			(unsigned) page_get_n_recs(page),
-			btr_page_get_index_id(page));
+			(ulonglong) btr_page_get_index_id(page));
 		ut_ad(0);
 	}
 }
@@ -4031,7 +4031,7 @@ ibuf_delete(
 				(unsigned) buf_block_get_space(block),
 				(unsigned) buf_block_get_page_no(block),
 				(unsigned) page_get_n_recs(page),
-				btr_page_get_index_id(page));
+				(ulonglong) btr_page_get_index_id(page));
 
 			ut_ad(0);
 			return;

No bundle (reason: useless for push emails).