From 75137522b904b611021288f59e51ad0f9c81c255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Wed, 21 May 2014 13:14:43 +0300 Subject: [PATCH] MDEV-6257: MariaDB 5.5 fails to start with 10.0 InnoDB log files 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. --- storage/innobase/srv/srv0start.c | 7 ++++--- storage/xtradb/srv/srv0start.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index d64f64fc934..49705712d41 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -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; diff --git a/storage/xtradb/srv/srv0start.c b/storage/xtradb/srv/srv0start.c index 1043ccfabae..d07fc6db1b3 100644 --- a/storage/xtradb/srv/srv0start.c +++ b/storage/xtradb/srv/srv0start.c @@ -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;