From: ramil
Date: December 28 2005 9:46am
Subject: bk commit into 5.0 tree (ramil:1.1999) BUG#15108
List-Archive: http://lists.mysql.com/commits/439
X-Bug: 15108
Message-Id: <200512280946.jBS9kYHb039454@myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1999 05/12/28 13:46:20 ramil@stripped +1 -0
  Fix for bug #15108: mysqld crashes when innodb_log_file_size is set > 4G        
                                                 

  sql/ha_innodb.cc
    1.282 05/12/28 13:45:58 ramil@stripped +2 -2
    Fix for bug #15108: mysqld crashes when innodb_log_file_size is set > 4G        
    - return 1 in case of error.                                                    

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0-release

--- 1.281/sql/ha_innodb.cc	2005-12-13 22:35:15 +04:00
+++ 1.282/sql/ha_innodb.cc	2005-12-28 13:45:58 +04:00
@@ -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;
 		}
 	}