Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/usr/home/ram/work/5.0.b15108

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b15108
f6a61875 · ramil@mysql.com · d5d6b514 · 01dbce64 · f6a61875
Commit f6a61875 authored Dec 26, 2005 by ramil@mysql.com
Hide 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
@@ -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;
 		}
 	}