1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1

Browse Source 
sql/ha_innodb.cc:
  Auto merged
This commit is contained in:
unknown 2005-12-29 19:11:36 +01:00
commit e6b215bf4c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/ha_innodb.cc
View File

@ -1234,7 +1234,7 @@ innobase_init(void)
"innobase_buffer_pool_size can't be over 4GB" "innobase_buffer_pool_size can't be over 4GB"
" on 32-bit systems"); " on 32-bit systems");
DBUG_RETURN(0); goto error;
} }
if (innobase_log_file_size > UINT_MAX32) { if (innobase_log_file_size > UINT_MAX32) {
@ -1242,7 +1242,7 @@ innobase_init(void)
"innobase_log_file_size can't be over 4GB" "innobase_log_file_size can't be over 4GB"
" on 32-bit systems"); " on 32-bit systems");
DBUG_RETURN(0); goto error;
} }
} }