Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6efdc398
Commit
6efdc398
authored
Jul 14, 2015
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-8463: 10.0 tree does not build
Merge error on srv0start.cc
parent
a9960ef0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
storage/xtradb/srv/srv0start.cc
storage/xtradb/srv/srv0start.cc
+1
-4
No files found.
storage/xtradb/srv/srv0start.cc
View file @
6efdc398
...
@@ -251,7 +251,7 @@ srv_file_check_mode(
...
@@ -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(
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment