bzr push into mysql-5.1 branch (satya.bodapati:3907 to 3908) Bug#14628410

[Satya Bodapati]

 3908 Satya Bodapati	2013-01-07
      Post Fix to Bug#14628410 - ASSERTION `! IS_SET()' FAILED IN
      			    DIAGNOSTICS_AREA::SET_OK_STATUS
      
      Use DBUG_RETURN() instead of return() if DBUG_ENTER() is
      used in the function. This patch is to  fix the Windows 
      pb2 failure on mysql-5.1
      
      Approved by Marko. rb#1792

    modified:
      storage/innodb_plugin/handler/ha_innodb.cc
 3907 Nirbhay Choubey	2013-01-07
      Bug#16066243 PB2 FAILURES I_MAIN.BUG15912213 AND
            I_MAIN.CTYPE_UTF8 FOR MACOSX10.6 FOR 5.1
      
      Part 2: Fix for test failures on Windows.

    modified:
      mysys/mf_pack.c
      mysys/my_lib.c
=== modified file 'storage/innodb_plugin/handler/ha_innodb.cc'
--- a/storage/innodb_plugin/handler/ha_innodb.cc	revid:nirbhay.choubey@stripped
+++ b/storage/innodb_plugin/handler/ha_innodb.cc	revid:satya.bodapati@stripped
@@ -1142,7 +1142,7 @@ innobase_mysql_tmpfile(void)
 
 	DBUG_EXECUTE_IF(
 		"innobase_tmpfile_creation_failure",
-		return(-1);
+		DBUG_RETURN(-1);
 	);
 
 	tmpdir = my_tmpdir(&mysql_tmpdir_list);

No bundle (reason: useless for push emails).