Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
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
certo
mariadb
Commits
4e47fb66
Commit
4e47fb66
authored
Nov 09, 2019
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed galera_recovery permission denied issue
parent
ebb8ace8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
Makefile
Makefile
+3
-0
mariadb-10.4.6-fix_galera_recovery.patch
mariadb-10.4.6-fix_galera_recovery.patch
+13
-0
No files found.
Makefile
View file @
4e47fb66
...
@@ -28,6 +28,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
...
@@ -28,6 +28,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
ln
-sv
/data/etc/gshadow
/etc/gshadow
ln
-sv
/data/etc/gshadow
/etc/gshadow
tar
xf
mariadb-10.4.6.tar.gz
tar
xf
mariadb-10.4.6.tar.gz
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-no_pam.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-no_pam.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-fix_galera_recovery.patch
cd
mariadb-10.4.6
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
cd
mariadb-10.4.6
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
mkdir
mariadb-10.4.6/build
mkdir
mariadb-10.4.6/build
cd
mariadb-10.4.6/build
&&
cmake
-DCMAKE_BUILD_TYPE
=
Release
-DINSTALL_LAYOUT
=
DEB
-DINSTALL_SYSCONF2DIR
=
/etc/my.cnf.d
-DWITH_EXTRA_CHARSETS
=
complex
-DSKIP_TESTS
=
ON
-DTOKUDB_OK
=
0
-DWITH_WSREP
=
ON
-DWITH_INNODB_DISALLOW_WRITES
=
ON ..
cd
mariadb-10.4.6/build
&&
cmake
-DCMAKE_BUILD_TYPE
=
Release
-DINSTALL_LAYOUT
=
DEB
-DINSTALL_SYSCONF2DIR
=
/etc/my.cnf.d
-DWITH_EXTRA_CHARSETS
=
complex
-DSKIP_TESTS
=
ON
-DTOKUDB_OK
=
0
-DWITH_WSREP
=
ON
-DWITH_INNODB_DISALLOW_WRITES
=
ON ..
...
@@ -155,6 +156,7 @@ client:
...
@@ -155,6 +156,7 @@ client:
tar
xf
mariadb-10.4.6.tar.gz
tar
xf
mariadb-10.4.6.tar.gz
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-no_pam.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-no_pam.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-fix_galera_recovery.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-without_server_fix.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-without_server_fix.patch
cd
mariadb-10.4.6
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
cd
mariadb-10.4.6
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
mkdir
mariadb-10.4.6/build
mkdir
mariadb-10.4.6/build
...
@@ -180,6 +182,7 @@ temporary:
...
@@ -180,6 +182,7 @@ temporary:
tar
xf
mariadb-10.4.6.tar.gz
tar
xf
mariadb-10.4.6.tar.gz
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-no_pam.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-no_pam.patch
patch
-Np1
-d
mariadb-10.4.6
<
mariadb-10.4.6-fix_galera_recovery.patch
cd
mariadb-10.4.6
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
cd
mariadb-10.4.6
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
mkdir
mariadb-10.4.6/build
mkdir
mariadb-10.4.6/build
cd
mariadb-10.4.6/build
&&
cmake
-DCMAKE_BUILD_TYPE
=
MinSizeRel
-DCMAKE_INSTALL_PREFIX
=
/build/usr
-DINSTALL_DOCDIR
=
share/doc/mariadb-10.4.6
-DINSTALL_DOCREADMEDIR
=
share/doc/mariadb-10.4.6
-DINSTALL_MANDIR
=
share/man
-DINSTALL_MYSQLSHAREDIR
=
share/mysql
-DINSTALL_MYSQLTESTDIR
=
share/mysql/test
-DINSTALL_PLUGINDIR
=
lib/mysql/plugin
-DINSTALL_SBINDIR
=
sbin
-DINSTALL_SCRIPTDIR
=
bin
-DINSTALL_SQLBENCHDIR
=
share/mysql/bench
-DINSTALL_SUPPORTFILESDIR
=
share/mysql
-DMYSQL_DATADIR
=
/build/var/lib/mysql
-DMYSQL_UNIX_ADDR
=
/run/mysql.sock
-DWITH_EXTRA_CHARSETS
=
complex
-DSKIP_TESTS
=
ON
-DTOKUDB_OK
=
0 ..
cd
mariadb-10.4.6/build
&&
cmake
-DCMAKE_BUILD_TYPE
=
MinSizeRel
-DCMAKE_INSTALL_PREFIX
=
/build/usr
-DINSTALL_DOCDIR
=
share/doc/mariadb-10.4.6
-DINSTALL_DOCREADMEDIR
=
share/doc/mariadb-10.4.6
-DINSTALL_MANDIR
=
share/man
-DINSTALL_MYSQLSHAREDIR
=
share/mysql
-DINSTALL_MYSQLTESTDIR
=
share/mysql/test
-DINSTALL_PLUGINDIR
=
lib/mysql/plugin
-DINSTALL_SBINDIR
=
sbin
-DINSTALL_SCRIPTDIR
=
bin
-DINSTALL_SQLBENCHDIR
=
share/mysql/bench
-DINSTALL_SUPPORTFILESDIR
=
share/mysql
-DMYSQL_DATADIR
=
/build/var/lib/mysql
-DMYSQL_UNIX_ADDR
=
/run/mysql.sock
-DWITH_EXTRA_CHARSETS
=
complex
-DSKIP_TESTS
=
ON
-DTOKUDB_OK
=
0 ..
...
...
mariadb-10.4.6-fix_galera_recovery.patch
0 → 100644
View file @
4e47fb66
diff -uNr mariadb-10.4.6/scripts/galera_recovery.sh mariadb-10.4.6-fix_galera_recovery/scripts/galera_recovery.sh
--- mariadb-10.4.6/scripts/galera_recovery.sh 2019-06-18 07:30:32.000000000 +0930
+++ mariadb-10.4.6-fix_galera_recovery/scripts/galera_recovery.sh 2019-11-09 16:49:57.308123233 +1030
@@ -101,8 +101,7 @@
# Safety checks
if [ -n "$log_file" -a -f "$log_file" ]; then
- [ "$euid" = "0" ] && chown $user $log_file
- chmod 600 $log_file
+ chmod 600 $log_file
else
log "WSREP: mktemp failed"
fi
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