diff options
author | unknown <aivanov@mysql.com> | 2006-01-16 15:23:02 +0300 |
---|---|---|
committer | unknown <aivanov@mysql.com> | 2006-01-16 15:23:02 +0300 |
commit | 0564fc4eff5d8ae0bf725e0fe7afae84401848d1 (patch) | |
tree | 96362721d189de6867c4dbacaa447a610b6c1eb3 /sql/ha_innodb.cc | |
parent | cf22d33aca111715eebf47b5ef354bae33da05eb (diff) | |
download | mariadb-git-0564fc4eff5d8ae0bf725e0fe7afae84401848d1.tar.gz |
Restore fix for bug #15108 (by ramil) erroneously erased
by applying innodb-5.0-ss115 snapshot.
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 4ae0bb52d17..c0f8559ab29 100644 --- 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; } } |