Commit 4236cd6a authored by unknown's avatar unknown

Fix for bug #15108: mysqld crashes when innodb_log_file_size is set > 4G


sql/ha_innodb.cc:
  Fix for bug #15108: mysqld crashes when innodb_log_file_size is set > 4G
  - return 1 in case of error.
parent 6eed9d51
...@@ -1218,7 +1218,7 @@ innobase_init(void) ...@@ -1218,7 +1218,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) {
...@@ -1226,7 +1226,7 @@ innobase_init(void) ...@@ -1226,7 +1226,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;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment