bzr push into mysql-trunk branch (marko.makela:3158 to 3159)

[marko.makela]

 3159 Marko Mäkelä	2011-06-06 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
 3158 Olav Sandstaa	2011-06-06
      This is preparation patch for Bug#12355958 "FAILING ASSERTION: 
      TRX->LOCK.N_ACTIVE_THRS == 1". It does not contain the fix for
      the bug but will make the bug fix simpler/better.
      
      The Item::with_subselect member variable is public and is used 
      directly in code outside the Item tree. This patch changes it
      to be protected and adds a new method Item::has_subquery() for
      getting the value of it.
      
      The patch should not change any behavior.
     @ sql/item.cc
        Changes in order for initialization of with_subselect in
        Item constructors.
     @ sql/item.h
        Make Item::with_subselect protected and add a getter
        fuction Item::has_subquery().
     @ sql/item_cmpfunc.cc
        Use the new Item::has_subquery() function instead of accessing
        Item::with_subselect directly.
     @ sql/item_func.cc
        Use the new Item::has_subquery() function instead of accessing
        Item::with_subselect directly.
     @ sql/sql_select.cc
        Use the new Item::has_subquery() function instead of accessing
        Item::with_subselect directly.

    modified:
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/sql_select.cc
=== modified file 'storage/innobase/include/page0page.h'
--- a/storage/innobase/include/page0page.h	revid:olav.sandstaa@stripped110606124955-vts4ql8y5c8n3tqu
+++ b/storage/innobase/include/page0page.h	revid:marko.makela@stripped831-lvvmxzkq1edxt3st
@@ -618,6 +618,7 @@ rec_t*
 page_rec_find_owner_rec(
 /*====================*/
 	rec_t*	rec);	/*!< in: the physical record */
+#ifndef UNIV_HOTBACKUP
 /***********************************************************************//**
 Write a 32-bit field in a data dictionary record. */
 UNIV_INLINE
@@ -626,9 +627,10 @@ page_rec_write_field(
 /*=================*/
 	rec_t*	rec,	/*!< in/out: record to update */
 	ulint	i,	/*!< in: index of the field to update */
-	ulint	page_no,/*!< in: value to write */
+	ulint	val,	/*!< in: value to write */
 	mtr_t*	mtr)	/*!< in/out: mini-transaction */
 	__attribute__((nonnull));
+#endif /* !UNIV_HOTBACKUP */
 /************************************************************//**
 Returns the maximum combined size of records which can be inserted on top
 of record heap.

=== modified file 'storage/innobase/include/page0page.ic'
--- a/storage/innobase/include/page0page.ic	revid:olav.sandstaa@stripped6124955-vts4ql8y5c8n3tqu
+++ b/storage/innobase/include/page0page.ic	revid:marko.makela@strippedlvvmxzkq1edxt3st
@@ -959,6 +959,7 @@ page_get_free_space_of_empty(
 		       - 2 * PAGE_DIR_SLOT_SIZE));
 }
 
+#ifndef UNIV_HOTBACKUP
 /***********************************************************************//**
 Write a 32-bit field in a data dictionary record. */
 UNIV_INLINE
@@ -979,6 +980,7 @@ page_rec_write_field(
 
 	mlog_write_ulint(data, val, MLOG_4BYTES, mtr);
 }
+#endif /* !UNIV_HOTBACKUP */
 
 /************************************************************//**
 Each user record on a page, and also the deleted user records in the heap

Attachment: [text/bzr-bundle] bzr/[e-mail]