Skip to content

GitLab

M
mariadb
Commit 556ed583 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated mariadb to 10.5.8

parent 0355978e
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 61 deletions
Makefile
View file @ 556ed583
...@@ -26,15 +26,13 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config ...@@ -26,15 +26,13 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
ln -sv /data/etc/shadow /etc/shadow ln -sv /data/etc/shadow /etc/shadow
mv -v /etc/gshadow /data/etc/gshadow mv -v /etc/gshadow /data/etc/gshadow
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.5.8.tar.gz
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-no_pam.patch cd mariadb-10.5.8 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-fix_galera_recovery.patch mkdir mariadb-10.5.8/build
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt cd mariadb-10.5.8/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 ..
mkdir mariadb-10.4.6/build $(MAKE) -C mariadb-10.5.8/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 .. $(MAKE) -C mariadb-10.5.8/build test
$(MAKE) -C mariadb-10.4.6/build $(MAKE) -C mariadb-10.5.8/build install
$(MAKE) -C mariadb-10.4.6/build test
$(MAKE) -C mariadb-10.4.6/build install
rm -rf /usr/mysql-test rm -rf /usr/mysql-test
@echo "$$CLIENT_CNF" > /etc/my.cnf.d/client.cnf @echo "$$CLIENT_CNF" > /etc/my.cnf.d/client.cnf
@echo "$$MYSQL_CLIENTS_CNF" > /etc/my.cnf.d/mysql-clients.cnf @echo "$$MYSQL_CLIENTS_CNF" > /etc/my.cnf.d/mysql-clients.cnf
...@@ -61,7 +59,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config ...@@ -61,7 +59,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.size[*],bash -c '\''echo "select sum($$(case "$$3" in both|"") echo "data_length+index_length";; data|index) echo "$$3_length";; free) echo "data_free";; esac)) from information_schema.tables$$([[ "$$1" = "all" || ! "$$1" ]] || echo " where table_schema=\\"$$1\\"")$$([[ "$$2" = "all" || ! "$$2" ]] || echo "and table_name=\\"$$2\\"");" | mysql -u root -N'\''' -i /etc/zabbix_agentd.conf sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.size[*],bash -c '\''echo "select sum($$(case "$$3" in both|"") echo "data_length+index_length";; data|index) echo "$$3_length";; free) echo "data_free";; esac)) from information_schema.tables$$([[ "$$1" = "all" || ! "$$1" ]] || echo " where table_schema=\\"$$1\\"")$$([[ "$$2" = "all" || ! "$$2" ]] || echo "and table_name=\\"$$2\\"");" | mysql -u root -N'\''' -i /etc/zabbix_agentd.conf
sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.discovery,l=$$(echo "show databases" | mysql -u root -N);echo -n '\''{"data":['\'';for i in $${l};do echo -n "{\\"{#DBNAME}\\": \\"$$i\\"},";done|sed -e '\''s:\\},$$:\\}:'\'';echo -n '\'']}'\'';' -i /etc/zabbix_agentd.conf sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.discovery,l=$$(echo "show databases" | mysql -u root -N);echo -n '\''{"data":['\'';for i in $${l};do echo -n "{\\"{#DBNAME}\\": \\"$$i\\"},";done|sed -e '\''s:\\},$$:\\}:'\'';echo -n '\'']}'\'';' -i /etc/zabbix_agentd.conf
sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.status[*],echo "show global status where Variable_name='\''\$$1'\'';" | mysql -u root -N | awk '\''{print $$$$2}'\''' -i /etc/zabbix_agentd.conf sed -e '/^UserParameter=device\.product.*/a UserParameter=mysql.status[*],echo "show global status where Variable_name='\''\$$1'\'';" | mysql -u root -N | awk '\''{print $$$$2}'\''' -i /etc/zabbix_agentd.conf
rm -rf mariadb-10.4.6 rm -rf mariadb-10.5.8
swapoff swap swapoff swap
rm -rf swap rm -rf swap
...@@ -166,16 +164,14 @@ client: mysql-config ...@@ -166,16 +164,14 @@ client: mysql-config
mkswap swap mkswap swap
swapon swap swapon swap
tar xf mariadb-10.4.6.tar.gz tar xf mariadb-10.5.8.tar.gz
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-no_pam.patch patch -Np1 -d mariadb-10.5.8 < mariadb-10.5.8-without_server_fix.patch
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-fix_galera_recovery.patch cd mariadb-10.5.8 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-without_server_fix.patch mkdir mariadb-10.5.8/build
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt cd mariadb-10.5.8/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DINSTALL_SYSCONF2DIR=/etc/my.cnf.d -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DWITHOUT_SERVER=ON -DTOKUDB_OK=0 ..
mkdir mariadb-10.4.6/build $(MAKE) -C mariadb-10.5.8/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 -DWITHOUT_SERVER=ON -DTOKUDB_OK=0 .. $(MAKE) -C mariadb-10.5.8/build test
$(MAKE) -C mariadb-10.4.6/build $(MAKE) -C mariadb-10.5.8/build install
$(MAKE) -C mariadb-10.4.6/build test
$(MAKE) -C mariadb-10.4.6/build install
rm -rf /usr/mysql-test rm -rf /usr/mysql-test
rm -f /usr/lib/tmpfiles.d/tmpfiles.conf rm -f /usr/lib/tmpfiles.d/tmpfiles.conf
rm -rf /lib/systemd/system/mariadb@bootstrap.service.d rm -rf /lib/systemd/system/mariadb@bootstrap.service.d
...@@ -183,7 +179,7 @@ client: mysql-config ...@@ -183,7 +179,7 @@ client: mysql-config
rm -f /lib/systemd/system/mariadb.service rm -f /lib/systemd/system/mariadb.service
@echo "$$MYSQL_CONFIG" > /etc/config/mysql @echo "$$MYSQL_CONFIG" > /etc/config/mysql
install -v -Dm755 mysql /usr/share/easycwmp/functions install -v -Dm755 mysql /usr/share/easycwmp/functions
rm -rf mariadb-10.4.6 rm -rf mariadb-10.5.8
swapoff swap swapoff swap
rm -rf swap rm -rf swap
...@@ -205,17 +201,15 @@ temporary: ...@@ -205,17 +201,15 @@ temporary:
mkswap swap mkswap swap
swapon swap swapon swap
tar xf mariadb-10.4.6.tar.gz tar xf mariadb-10.5.8.tar.gz
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-no_pam.patch cd mariadb-10.5.8 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
patch -Np1 -d mariadb-10.4.6 < mariadb-10.4.6-fix_galera_recovery.patch mkdir mariadb-10.5.8/build
cd mariadb-10.4.6 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt cd mariadb-10.5.8/build && cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/build/usr -DINSTALL_DOCDIR=share/doc/mariadb-10.5.8 -DINSTALL_DOCREADMEDIR=share/doc/mariadb-10.5.8 -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 ..
mkdir mariadb-10.4.6/build $(MAKE) -C mariadb-10.5.8/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 .. -$(MAKE) -C mariadb-10.5.8/build test
$(MAKE) -C mariadb-10.4.6/build $(MAKE) -C mariadb-10.5.8/build install
-$(MAKE) -C mariadb-10.4.6/build test
$(MAKE) -C mariadb-10.4.6/build install
rm -rf /build/usr/share/mysql/test rm -rf /build/usr/share/mysql/test
rm -rf mariadb-10.4.6 rm -rf mariadb-10.5.8
/build/usr/bin/mysql_install_db --basedir=/build/usr --datadir=/build/var/lib/mysql --user=nobody /build/usr/bin/mysql_install_db --basedir=/build/usr --datadir=/build/var/lib/mysql --user=nobody
install -v -m755 -o nobody -g nobody -d /build/run/mysqld install -v -m755 -o nobody -g nobody -d /build/run/mysqld
......
mariadb-10.4.6-fix_galera_recovery.patch deleted 100644 → 0
View file @ 0355978e
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
mariadb-10.4.6-no_pam.patch deleted 100644 → 0
View file @ 0355978e
diff -uNr mariadb-10.4.6/scripts/mysql_install_db.sh mariadb-10.4.6-no_pam/scripts/mysql_install_db.sh
--- mariadb-10.4.6/scripts/mysql_install_db.sh 2019-06-18 07:30:32.000000000 +0930
+++ mariadb-10.4.6-no_pam/scripts/mysql_install_db.sh 2019-10-19 20:00:32.333667865 +1030
@@ -467,13 +467,6 @@
if test -n "$user"
then
- chown $user "$pamtooldir/auth_pam_tool_dir"
- if test $? -ne 0
- then
- echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
- echo " to the '$user' user. Check that you have the necessary permissions and try again."
- exit 1
- fi
if test -z "$srcdir"
then
chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
mariadb-10.4.6-without_server_fix.patch → mariadb-10.5.8-without_server_fix.patch
View file @ 556ed583
diff -uNr mariadb-10.4.6/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp
--- mariadb-10.4.6/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2019-06-18 07:30:32.000000000 +0930 --- mariadb-10.5.8/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2020-11-10 23:44:59.000000000 +1030
+++ mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2019-10-09 20:11:16.855690475 +1030 +++ mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2021-01-22 18:51:43.799497705 +1030
@@ -9,7 +9,8 @@ @@ -9,7 +9,8 @@
#ifndef DENA_AUTO_ADDRINFO_HPP #ifndef DENA_AUTO_ADDRINFO_HPP
#define DENA_AUTO_ADDRINFO_HPP #define DENA_AUTO_ADDRINFO_HPP
...@@ -11,9 +11,9 @@ diff -uNr mariadb-10.4.6/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mar ...@@ -11,9 +11,9 @@ diff -uNr mariadb-10.4.6/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mar
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <string.h> #include <string.h>
diff -uNr mariadb-10.4.6/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp
--- mariadb-10.4.6/plugin/handler_socket/libhsclient/hstcpcli.cpp 2019-06-18 07:30:32.000000000 +0930 --- mariadb-10.5.8/plugin/handler_socket/libhsclient/hstcpcli.cpp 2020-11-10 23:44:59.000000000 +1030
+++ mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp 2019-10-09 20:11:17.056690968 +1030 +++ mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp 2021-01-22 18:51:43.800497708 +1030
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
* See COPYRIGHT.txt for details. * See COPYRIGHT.txt for details.
*/ */
...@@ -24,9 +24,9 @@ diff -uNr mariadb-10.4.6/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb- ...@@ -24,9 +24,9 @@ diff -uNr mariadb-10.4.6/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb-
#include <stdexcept> #include <stdexcept>
#include "hstcpcli.hpp" #include "hstcpcli.hpp"
diff -uNr mariadb-10.4.6/plugin/handler_socket/libhsclient/socket.cpp mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp diff -uNr mariadb-10.5.8/plugin/handler_socket/libhsclient/socket.cpp mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp
--- mariadb-10.4.6/plugin/handler_socket/libhsclient/socket.cpp 2019-06-18 07:30:32.000000000 +0930 --- mariadb-10.5.8/plugin/handler_socket/libhsclient/socket.cpp 2020-11-10 23:44:59.000000000 +1030
+++ mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp 2019-10-09 20:11:18.245693883 +1030 +++ mariadb-10.5.8-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp 2021-01-22 18:51:43.800497708 +1030
@@ -6,10 +6,13 @@ @@ -6,10 +6,13 @@
* See COPYRIGHT.txt for details. * See COPYRIGHT.txt for details.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment