From 4236cd6aa51888539606e44cf800fc47f6fecb44 Mon Sep 17 00:00:00 2001
From: unknown <ramil@mysql.com>
Date: Thu, 24 Nov 2005 13:04:05 +0400
Subject: [PATCH] Fix for bug #15108: mysqld crashes when innodb_log_file_size
 is set > 4G

sql/ha_innodb.cc:
  Fix for bug #15108: mysqld crashes when innodb_log_file_size is set > 4G
  - return 1 in case of error.
---
 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 56e5fd8923f..6c89618c83a 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