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

srv0start.c:

Browse Source 
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
This commit is contained in:
unknown 2003-03-03 16:29:16 +02:00
parent 2855415058
commit 9ca8f13734
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
innobase/srv/srv0start.c
View File

@ -577,8 +577,11 @@ open_or_create_log_file(
|| size_high != srv_calc_high32(srv_log_file_size)) { || size_high != srv_calc_high32(srv_log_file_size)) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Error: log file %s is of different size\n" "InnoDB: Error: log file %s is of different size %lu %lu bytes\n"
"InnoDB: than specified in the .cnf file!\n", name); "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); return(DB_ERROR);
} }
@ -770,8 +773,13 @@ open_or_create_data_files(
rounded_size_pages)) { rounded_size_pages)) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Error: data file %s is of a different size\n" "InnoDB: Error: auto-extending data file %s is of a different size\n"
"InnoDB: than specified in the .cnf file!\n", name); "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] = srv_data_file_sizes[i] =
@ -782,8 +790,11 @@ open_or_create_data_files(
!= srv_data_file_sizes[i]) { != srv_data_file_sizes[i]) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Error: data file %s is of a different size\n" "InnoDB: Error: data file %s is of a different size\n"
"InnoDB: than specified in the .cnf file!\n", name); "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); return(DB_ERROR);
} }