diff options
| author | unknown <heikki@hundin.mysql.fi> | 2003-03-03 16:29:16 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2003-03-03 16:29:16 +0200 |
| commit | 9ca8f13734d103a44f1653ef7bf1a3ae2747e750 (patch) | |
| tree | 58996de9a68ca3e14b29f29dde09787e5d04388f /innobase | |
| parent | 285541505844c01546c37a46fcad92685e99cd3c (diff) | |
| download | mariadb-git-9ca8f13734d103a44f1653ef7bf1a3ae2747e750.tar.gz | |
srv0start.c:
Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf
innobase/srv/srv0start.c:
Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/srv/srv0start.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index 65284d51b04..20e7514a4ea 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -577,8 +577,11 @@ open_or_create_log_file( || size_high != srv_calc_high32(srv_log_file_size)) { fprintf(stderr, - "InnoDB: Error: log file %s is of different size\n" - "InnoDB: than specified in the .cnf file!\n", name); +"InnoDB: Error: log file %s is of different size %lu %lu bytes\n" +"InnoDB: than specified in the .cnf file %lu %lu bytes!\n", + name, size_high, size, + srv_calc_high32(srv_log_file_size), + srv_calc_low32(srv_log_file_size)); return(DB_ERROR); } @@ -770,8 +773,13 @@ open_or_create_data_files( rounded_size_pages)) { fprintf(stderr, - "InnoDB: Error: data file %s is of a different size\n" - "InnoDB: than specified in the .cnf file!\n", name); +"InnoDB: Error: auto-extending data file %s is of a different size\n" +"InnoDB: %lu pages (rounded down to MB) than specified in the .cnf file:\n" +"InnoDB: initial %lu pages, max %lu (relevant if non-zero) pages!\n", + name, rounded_size_pages, + srv_data_file_sizes[i], srv_last_file_size_max); + + return(DB_ERROR); } srv_data_file_sizes[i] = @@ -782,8 +790,11 @@ open_or_create_data_files( != srv_data_file_sizes[i]) { fprintf(stderr, - "InnoDB: Error: data file %s is of a different size\n" - "InnoDB: than specified in the .cnf file!\n", name); +"InnoDB: Error: data file %s is of a different size\n" +"InnoDB: %lu pages (rounded down to MB)\n" +"InnoDB: than specified in the .cnf file %lu pages!\n", name, + rounded_size_pages, + srv_data_file_sizes[i]); return(DB_ERROR); } |