From 0564fc4eff5d8ae0bf725e0fe7afae84401848d1 Mon Sep 17 00:00:00 2001
From: unknown <aivanov@mysql.com>
Date: Mon, 16 Jan 2006 15:23:02 +0300
Subject: [PATCH] Restore fix for bug #15108 (by ramil) erroneously erased  by
 applying innodb-5.0-ss115 snapshot.

---
 sql/ha_innodb.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 4ae0bb52d1..c0f8559ab2 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -1218,7 +1218,7 @@ innobase_init(void)
 				"innobase_buffer_pool_size can't be over 4GB"
 				" on 32-bit systems");
 
-			DBUG_RETURN(0);
+			goto error;
 		}
 
 		if (innobase_log_file_size > UINT_MAX32) {
@@ -1226,7 +1226,7 @@ innobase_init(void)
 				"innobase_log_file_size can't be over 4GB"
 				" on 32-bit systems");
 
-			DBUG_RETURN(0);
+			goto error;
 		}
 	}
 
-- 
2.30.9