diff options
| author | unknown <ramil@mysql.com> | 2005-12-26 11:18:01 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-12-26 11:18:01 +0400 |
| commit | f04a36190850ac4393448c3339ca51523cb6f85c (patch) | |
| tree | 00e3272798b09efee47d1ceecdc1b7304fa21b6d /sql/ha_innodb.cc | |
| parent | eb12c38b47b3952de3f752a93ec1e27b782a4c6f (diff) | |
| parent | e72ec933d9431927efa0af4abe77c8eacc97eacd (diff) | |
| download | mariadb-git-f04a36190850ac4393448c3339ca51523cb6f85c.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b15108
sql/ha_innodb.cc:
Auto merged
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 afeb1238aa7..744bd242fca 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; } } |