bzr push into mysql-trunk-innodb branch (marko.makela:3484 to 3485)

[marko.makela]

 3485 Marko Mäkelä	2011-02-07
      Fix bogus Microsoft Visual Studio warnings.
      ut_error does not return.

    modified:
      storage/innobase/lock/lock0wait.c
      storage/innobase/trx/trx0roll.c
 3484 Vasil Dimov	2011-02-07 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb

    modified:
      mysql-test/valgrind.supp
=== modified file 'storage/innobase/lock/lock0wait.c'
--- a/storage/innobase/lock/lock0wait.c	revid:[e-mail]-20110207175505-1dzrsn3slhf7hpao
+++ b/storage/innobase/lock/lock0wait.c	revid:marko.makela@stripped0207211243-7jbzaxdi3q6i53nm
@@ -192,6 +192,7 @@ lock_wait_table_reserve_slot(
 	lock_wait_table_print();
 
 	ut_error;
+	return(NULL);
 }
 
 /***************************************************************//**

=== modified file 'storage/innobase/trx/trx0roll.c'
--- a/storage/innobase/trx/trx0roll.c	revid:vasil.dimov@stripped05-1dzrsn3slhf7hpao
+++ b/storage/innobase/trx/trx0roll.c	revid:marko.makela@strippedi53nm
@@ -244,6 +244,7 @@ trx_rollback_last_sql_stat_for_mysql(
 	}
 
 	ut_error;
+	return(DB_CORRUPTION);
 }
 
 /*******************************************************************//**

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