Port r139 from branches/5.0:

From MySQL:

Fix bug #15108 (mysqld crashes when innodb_log_file_size is set > 4GB).

handler/ha_innodb.cc

@@ -1239,7 +1239,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) {
@@ -1247,7 +1247,7 @@ innobase_init(void)
 				"innobase_log_file_size can't be over 4GB"
 				" on 32-bit systems");
 
-			DBUG_RETURN(0);
+			goto error;
 		}
 	}