From e40fa2ba98474f2f28ccd5aafa34159d81587a57 Mon Sep 17 00:00:00 2001
From: Satya Bodapati <satya.bodapati@oracle.com>
Date: Mon, 7 Jan 2013 16:56:16 +0530
Subject: [PATCH] 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
---
 storage/innodb_plugin/handler/ha_innodb.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
index e15c84c8346..51068d26eff 100644
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
@@ -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);