Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1
sql/ha_innodb.cc: Auto merged
This commit is contained in:
commit
e6b215bf4c
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user