bk commit into 5.0 tree (aivanov:1.2023) BUG#15108

[Alex Ivanov]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.2023 06/01/16 15:23:02 aivanov@stripped +1 -0
  Restore fix for bug #15108 (by ramil) erroneously erased
   by applying innodb-5.0-ss115 snapshot.

  sql/ha_innodb.cc
    1.283 06/01/16 15:22:53 aivanov@stripped +2 -2
    Restore fix for bug #15108 (by ramil) erroneously erased
     by applying innodb-5.0-ss115 snapshot.

# 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:	aivanov
# Host:	mysql.creware.com
# Root:	/home/alexi/innodb-ss/mysql-5.0-ss115

--- 1.282/sql/ha_innodb.cc	2006-01-16 14:03:56 +03:00
+++ 1.283/sql/ha_innodb.cc	2006-01-16 15:22:53 +03:00
@@ -1218,7 +1218,7 @@
 				"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_log_file_size can't be over 4GB"
 				" on 32-bit systems");
 
-			DBUG_RETURN(0);
+			goto error;
 		}
 	}