mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-6257: MariaDB 5.5 fails to start with 10.0 InnoDB log files

Browse source 
Analysis: By default 10.0 creates 48M log files and 5.5 assumes they
are 5M.

Fix: Remove the error and do size comparison later.
This commit is contained in:
Jan Lindström 2014-05-21 13:14:43 +03:00
parent a55c159424
commit 75137522b9
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/innobase/srv/srv0start.c
View file

@ -624,16 +624,17 @@ open_or_create_log_file(
if (size != srv_calc_low32(srv_log_file_size)
|| size_high != srv_calc_high32(srv_log_file_size)) {
/* By default 5.6 based InnoDB will create 48M log
file but 5.5 only 5M. Actual size error must be
tested later. */
fprintf(stderr,
"InnoDB: Error: log file %s is"
"InnoDB: Warning: log file %s is"
" of different size %lu %lu bytes\n"
"InnoDB: than specified in the .cnf"
" file %lu %lu bytes!\n",
name, (ulong) size_high, (ulong) size,
(ulong) srv_calc_high32(srv_log_file_size),
(ulong) srv_calc_low32(srv_log_file_size));
return(DB_ERROR);
}
} else {
*log_file_created = TRUE;

7
storage/xtradb/srv/srv0start.c
View file

@ -618,16 +618,17 @@ open_or_create_log_file(
if (size != srv_calc_low32(srv_log_file_size)
|| size_high != srv_calc_high32(srv_log_file_size)) {
/* By default 5.6 based InnoDB will create 48M log
file but 5.5 only 5M. Actual size error must be
tested later. */
fprintf(stderr,
"InnoDB: Error: log file %s is"
"InnoDB: Warning: log file %s is"
" of different size %lu %lu bytes\n"
"InnoDB: than specified in the .cnf"
" file %lu %lu bytes!\n",
name, (ulong) size_high, (ulong) size,
(ulong) srv_calc_high32(srv_log_file_size),
(ulong) srv_calc_low32(srv_log_file_size));
return(DB_ERROR);
}
} else {
*log_file_created = TRUE;