Commits (1)
......@@ -28,6 +28,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
ln -sv /data/etc/gshadow /etc/gshadow
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-fix_galera_recovery.patch
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
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 ..
......@@ -155,6 +156,7 @@ client:
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-fix_galera_recovery.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
mkdir mariadb-10.4.6/build
......@@ -180,6 +182,7 @@ temporary:
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-fix_galera_recovery.patch
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
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 ..
......
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