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
48e6918c
Commit
48e6918c
authored
Aug 08, 2023
by
Andrew Hutchings
Committed by
Andrew Hutchings
Aug 08, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "update galera_new_cluster to use environment file"
This reverts commit
b54e4bf0
.
parent
277968aa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
20 deletions
+2
-20
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+0
-15
scripts/galera_new_cluster.sh
scripts/galera_new_cluster.sh
+2
-2
support-files/mariadb.service.in
support-files/mariadb.service.in
+0
-3
No files found.
scripts/CMakeLists.txt
View file @
48e6918c
...
...
@@ -190,9 +190,6 @@ ELSE()
SET
(
localstatedir
${
MYSQL_DATADIR
}
)
ENDIF
()
get_filename_component
(
MYSQL_UNIX_DIR
${
MYSQL_UNIX_ADDR
}
DIRECTORY
)
SET
(
mysqlunixdir
${
MYSQL_UNIX_DIR
}
)
SET
(
resolveip_locations
"$basedir/
${
INSTALL_BINDIR
}
$basedir/bin"
)
SET
(
mysqld_locations
"$basedir/
${
INSTALL_SBINDIR
}
$basedir/libexec $basedir/sbin $basedir/bin"
)
SET
(
errmsg_locations
"$basedir/
${
INSTALL_MYSQLSHAREDIR
}
/english $basedir/share/english $basedir/share/mysql/english"
)
...
...
@@ -210,18 +207,6 @@ INSTALL_SCRIPT(
DESTINATION
${
INSTALL_SCRIPTDIR
}
COMPONENT Server
)
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/galera_new_cluster.sh
${
CMAKE_CURRENT_BINARY_DIR
}
/galera_new_cluster ESCAPE_QUOTES @ONLY
)
EXECUTE_PROCESS
(
COMMAND chmod +x
${
CMAKE_CURRENT_BINARY_DIR
}
/galera_new_cluster
)
INSTALL_SCRIPT
(
"
${
CMAKE_CURRENT_BINARY_DIR
}
/galera_new_cluster"
DESTINATION
${
INSTALL_SCRIPTDIR
}
COMPONENT Server
)
ENDIF
()
SET
(
prefix
"
${
CMAKE_INSTALL_PREFIX
}
"
)
...
...
scripts/galera_new_cluster.sh
100644 → 100755
View file @
48e6918c
...
...
@@ -21,11 +21,11 @@ EOF
exit
0
fi
echo
_WSREP_NEW_CLUSTER
=
'--wsrep-new-cluster'
>
@mysqlunixdir@/
"wsrep-new-cluster-
${
1
:-
mariadb
}
"
&&
\
systemctl set-environment
_WSREP_NEW_CLUSTER
=
'--wsrep-new-cluster'
&&
\
systemctl restart
${
1
:-
mariadb
}
extcode
=
$?
rm
-f
@mysqlunixdir@/
"wsrep-new-cluster-
${
1
:-
mariadb
}
"
systemctl set-environment
_WSREP_NEW_CLUSTER
=
''
exit
$extcode
support-files/mariadb.service.in
View file @
48e6918c
...
...
@@ -70,9 +70,6 @@ ProtectSystem=full
# Prevent accessing /home, /root and /run/user
ProtectHome=true
# Use an environment file to pass variable _WSREP_NEW_CLUSTER
EnvironmentFile=-@mysqlunixdir@/wsrep-new-cluster-%N
# Use an environment file to pass variable _WSREP_START_POSITION
EnvironmentFile=-@mysqlunixdir@/wsrep-start-position
...
...
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