Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1

sql/ha_innodb.cc: Auto merged

Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1
sql/ha_innodb.cc: Auto merged
e6b215bf · unknown · f8df1290 · e72ec933 · e6b215bf
Commit e6b215bf authored Dec 29, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/ha_innodb.cc sql/ha_innodb.cc +2 -2

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -1234,7 +1234,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) {
@@ -1242,7 +1242,7 @@ innobase_init(void)
 				"innobase_log_file_size can't be over 4GB"
 				" on 32-bit systems");
-			DBUG_RETURN(0);
+			goto error;
 		}
 	}