bzr push into mysql-5.5 branch (marko.makela:3593 to 3594)

[marko.makela]

 3594 Marko Mäkelä	2011-10-27 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      storage/innobase/row/row0mysql.c
 3593 Jimmy Yang	2011-10-27 [merge]
      Fix Bug #11835889 - INNODB ASSERTS ON BAD FILE READ, INDEX TRANSLATION
      TABLE ERROR, RECOVERY
                  
      rb://792 approved by Sunny Bains

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/row/row0mysql.c'
--- a/storage/innobase/row/row0mysql.c	revid:jimmy.yang@stripped027074053-ay64atqfxz8zuo00
+++ b/storage/innobase/row/row0mysql.c	revid:marko.makela@strippedfutfhyc4eio11
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2010, Innobase Oy. All Rights Reserved.
+Copyright (c) 2000, 2011, Oracle and/or its affiliates. All Rights Reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -3995,6 +3995,7 @@ end:
 			trx->error_state = DB_SUCCESS;
 			trx_general_rollback_for_mysql(trx, NULL);
 			trx->error_state = DB_SUCCESS;
+			err = DB_ERROR;
 			goto funct_exit;
 		}
 

No bundle (reason: useless for push emails).