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
2ef01d00
Commit
2ef01d00
authored
Dec 30, 2023
by
Brad Smith
Committed by
Daniel Black
Jan 19, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wsrep scripts fixes for working on OpenBSD
parent
ee1407f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
scripts/wsrep_sst_common.sh
scripts/wsrep_sst_common.sh
+3
-3
scripts/wsrep_sst_rsync.sh
scripts/wsrep_sst_rsync.sh
+3
-3
No files found.
scripts/wsrep_sst_common.sh
View file @
2ef01d00
...
...
@@ -1166,9 +1166,9 @@ is_local_ip()
# the domain name check:
if
[
"
${
2
:-
0
}
"
-eq
0
]
;
then
# We consider all the names of a given host to be local addresses:
[
"
$1
"
=
"
$(
hostname
-s
)
"
-o
\
"
$1
"
=
"
$(
hostname
-f
)
"
-o
\
"
$1
"
=
"
$(
hostname
-d
)
"
]
&&
return
0
[
"
$1
"
=
"
$(
hostname
-s
2>/dev/null
)
"
-o
\
"
$1
"
=
"
$(
hostname
-f
2>/dev/null
)
"
-o
\
"
$1
"
=
"
$(
hostname
-d
2>/dev/null
)
"
]
&&
return
0
fi
# If the address contains anything other than digits
# and separators, it is not a local address:
...
...
scripts/wsrep_sst_rsync.sh
View file @
2ef01d00
...
...
@@ -475,9 +475,9 @@ EOF
# Preparing binlog files for transfer:
wsrep_log_info
"Preparing binlog files for transfer:"
tar_type
=
0
if
tar
--help
|
grep
-qw
-F
--
'--transform'
;
then
if
tar
--help
2>/dev/null
|
grep
-qw
-F
--
'--transform'
;
then
tar_type
=
1
elif
tar
--version
|
grep
-qw
-E
'^bsdtar'
;
then
elif
tar
--version
2>/dev/null
|
grep
-qw
-E
'^bsdtar'
;
then
tar_type
=
2
fi
if
[
$tar_type
-eq
2
]
;
then
...
...
@@ -980,7 +980,7 @@ EOF
fi
# Extracting binlog files:
wsrep_log_info
"Extracting binlog files:"
if
tar
--version
|
grep
-qw
-E
'^bsdtar'
;
then
if
tar
--version
2>/dev/null
|
grep
-qw
-E
'^bsdtar'
;
then
tar
-tf
"
$BINLOG_TAR_FILE
"
>
"
$tmpfile
"
&&
\
tar
-xvf
"
$BINLOG_TAR_FILE
"
>
/dev/null
||
RC
=
$?
else
...
...
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