bzr push into mysql-trunk-wl5522 branch (marko.makela:4077 to 4079)

[marko.makela]

 4079 Marko Mäkelä	2012-04-18
      Use table_id_t instead of ib_id_t for table_id.

    modified:
      storage/innobase/ibuf/ibuf0ibuf.cc
 4078 Marko Mäkelä	2012-04-18
      Remove an unnecesary type cast.

    modified:
      storage/innobase/trx/trx0roll.cc
 4077 Marko Mäkel    mysql-test/suite/innodb/t/innodb_mysql.test
      storage/innobase/fil/fil0fil.cc
      storage/innobase/row/row0mysql.cc
=== modified file 'storage/innobase/ibuf/ibuf0ibuf.cc'
--- a/storage/innobase/ibuf/ibuf0ibuf.cc	revid:marko.makela@stripped
+++ b/storage/innobase/ibuf/ibuf0ibuf.cc	revid:marko.makela@stripped
@@ -2617,12 +2617,12 @@ ibuf_merge_pages(
 
 /*********************************************************************//**
 Get the table instance from the table id.
-@return table instance. */
-static
+@return table instance */
+static __attribute__((warn_unused_result))
 dict_table_t*
 ibuf_get_table(
 /*===========*/
-	ib_id_t	table_id)	/*!< in: valid table id */
+	table_id_t	table_id)	/*!< in: valid table id */
 {
 	rw_lock_s_lock_func(&dict_operation_lock, 0, __FILE__, __LINE__);
 
@@ -2716,17 +2716,20 @@ Contracts insert buffer trees by reading
 @return a lower limit for the combined size in bytes of entries which
 will be merged from ibuf trees to the pages read, 0 if ibuf is
 empty */
-static
+static __attribute__((nonnull, warn_unused_result))
 ulint
 ibuf_merge(
 /*=======*/
-	ib_id_t	table_id,	/*!< in: if merge should be done only for
-				a specific table, for all tables this should
-				be 0 */
-	ulint*	n_pages,	/*!< out: number of pages to which merged */
-	bool	sync)		/*!< in: TRUE if the caller wants to wait for
-				the issued read with the highest tablespace
-				address to complete */
+	table_id_t	table_id,	/*!< in: if merge should be
+					done only for a specific
+					table, for all tables this
+					should be 0 */
+	ulint*		n_pages,	/*!< out: number of pages to
+					which merged */
+	bool		sync)		/*!< in: TRUE if the caller
+					wants to wait for the issued
+					read with the highest
+					tablespace address to complete */
 {
 	dict_table_t*	table;
 

=== modified file 'storage/innobase/trx/trx0roll.cc'
--- a/storage/innobase/trx/trx0roll.cc	revid:marko.makela@stripped
+++ b/storage/innobase/trx/trx0roll.cc	revid:marko.makela@stripped20120418104912-2b1dddt5n0nezzp1
@@ -646,8 +646,7 @@ trx_rollback_active(
 			ib_logf(IB_LOG_LEVEL_WARN,
 				"Dropping table '%s', with id " UINT64PF " "
 				"in recovery",
-				table->name,
-				(ib_uint64_t) trx->table_id);
+				table->name, trx->table_id);
 
 			err = row_drop_table_for_mysql(table->name, trx, TRUE);
 			trx_commit_for_mysql(trx);

No bundle (reason: useless for push emails).