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

MDEV-8463: 10.0 tree does not build

Browse Source 
Merge error on srv0start.cc
This commit is contained in:
Jan Lindström 2015-07-14 20:36:23 +03:00
parent a9960ef0ec
commit 6efdc398ba
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
storage/xtradb/srv/srv0start.cc
View File

@ -251,7 +251,7 @@ srv_file_check_mode(
/* Note: stat.rw_perm is only valid of files */ /* Note: stat.rw_perm is only valid of files */
if (stat.type == OS_FILE_TYPE_FILE { if (stat.type == OS_FILE_TYPE_FILE) {
if (!stat.rw_perm) { if (!stat.rw_perm) {
@ -937,9 +937,6 @@ open_or_create_data_files(
const char* check_msg; const char* check_msg;
check_msg = fil_read_first_page( check_msg = fil_read_first_page(
files[i], FALSE, &flags, &space, files[i], FALSE, &flags, &space,
#ifdef UNIV_LOG_ARCHIVE
min_arch_log_no, max_arch_log_no,
#endif /* UNIV_LOG_ARCHIVE */
min_flushed_lsn, max_flushed_lsn); min_flushed_lsn, max_flushed_lsn);
/* If first page is valid, don't overwrite DB. /* If first page is valid, don't overwrite DB.