bzr push into mysql-5.1 branch (marko.makela:3633 to 3634) Bug#12884631

[marko.makela]

 3634 Marko Mäkelä	2011-10-27
      Bug #12884631 62146: TABLES ARE LOST FOR DDL
      
      row_rename_table_for_mysql(): Return DB_ERROR instead of DB_SUCCESS
      when fil_rename_tablespace() returns an error. This bug was introduced
      in the InnoDB Plugin.
      
      Approved by Sunny Bains over IM.

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/row/row0mysql.c
 3633 Karen Langford	2011-10-26
      Increased version number after cloning 5.1.60

    modified:
      configure.in
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:karen.langford@stripped
+++ b/storage/innodb_plugin/ChangeLog	revid:[e-mail]-20111027115812-62se3067nemq2r27
@@ -1,3 +1,8 @@
[phone]	The InnoDB Team
+
+	* row/row0mysql.c:
+	Fix Bug #12884631 62146: TABLES ARE LOST FOR DDL
+
 2011-10-20	The InnoDB Team
 
 	* btr/brt0cur.c:

=== modified file 'storage/innodb_plugin/row/row0mysql.c'
--- a/storage/innodb_plugin/row/row0mysql.c	revid:[e-mail]-20111026184842-ambjfcndjiw4eo6n
+++ b/storage/innodb_plugin/row/row0mysql.c	revid:marko.makela@stripped11027115812-62se3067nemq2r27
@@ -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
@@ -3971,6 +3971,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).