Skip to content

GitLab

M
mariadb
Commit 90b44706 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated mariadb to 10.4.6

parent 7b745f8d
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 25 deletions
Makefile
View file @ 90b44706
......@@ -26,13 +26,13 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
ln -sv /data/etc/shadow /etc/shadow
mv -v /etc/gshadow /data/etc/gshadow
ln -sv /data/etc/gshadow /etc/gshadow
tar xf mariadb-10.3.13.tar.gz
cd mariadb-10.3.13 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
mkdir mariadb-10.3.13/build
cd mariadb-10.3.13/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.3.13/build
$(MAKE) -C mariadb-10.3.13/build test
$(MAKE) -C mariadb-10.3.13/build install
tar xf mariadb-10.4.6.tar.gz
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 ..
$(MAKE) -C mariadb-10.4.6/build
$(MAKE) -C mariadb-10.4.6/build test
$(MAKE) -C mariadb-10.4.6/build install
rm -rf /usr/mysql-test
@echo "$$CLIENT_CNF" > /etc/my.cnf.d/client.cnf
@echo "$$MYSQL_CLIENTS_CNF" > /etc/my.cnf.d/mysql-clients.cnf
......@@ -54,7 +54,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.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
rm -rf mariadb-10.3.13
rm -rf mariadb-10.4.6
swapoff swap
rm -rf swap
......@@ -152,20 +152,20 @@ client:
mkswap swap
swapon swap
tar xf mariadb-10.3.13.tar.gz
patch -Np1 -d mariadb-10.3.13 < mariadb-10.3.13-without_server_fix.patch
cd mariadb-10.3.13 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
mkdir mariadb-10.3.13/build
cd mariadb-10.3.13/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.3.13/build
$(MAKE) -C mariadb-10.3.13/build test
$(MAKE) -C mariadb-10.3.13/build install
tar xf mariadb-10.4.6.tar.gz
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
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.4.6/build
$(MAKE) -C mariadb-10.4.6/build test
$(MAKE) -C mariadb-10.4.6/build install
rm -rf /usr/mysql-test
rm -f /usr/lib/tmpfiles.d/tmpfiles.conf
rm -rf /lib/systemd/system/mariadb@bootstrap.service.d
rm -f /lib/systemd/system/mariadb@.service
rm -f /lib/systemd/system/mariadb.service
rm -rf mariadb-10.3.13
rm -rf mariadb-10.4.6
swapoff swap
rm -rf swap
......@@ -176,15 +176,15 @@ temporary:
mkswap swap
swapon swap
tar xf mariadb-10.3.13.tar.gz
cd mariadb-10.3.13 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
mkdir mariadb-10.3.13/build
cd mariadb-10.3.13/build && cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=/build/usr -DINSTALL_DOCDIR=share/doc/mariadb-10.3.13 -DINSTALL_DOCREADMEDIR=share/doc/mariadb-10.3.13 -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.3.13/build
-$(MAKE) -C mariadb-10.3.13/build test
$(MAKE) -C mariadb-10.3.13/build install
tar xf mariadb-10.4.6.tar.gz
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 ..
$(MAKE) -C mariadb-10.4.6/build
-$(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 mariadb-10.3.13
rm -rf mariadb-10.4.6
/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
......
mariadb-10.3.13-without_server_fix.patch → mariadb-10.4.6-without_server_fix.patch
View file @ 90b44706
diff -uNr mariadb-10.3.13/plugin/handler_socket/libhsclient/auto_addrinfo.hpp mariadb-10.3.13-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp
--- mariadb-10.3.13/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2019-02-20 18:29:11.000000000 +1030
+++ mariadb-10.3.13-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2019-03-25 23:00:52.154177054 +1030
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
--- mariadb-10.4.6/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2019-06-18 07:30:32.000000000 +0930
+++ mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/auto_addrinfo.hpp 2019-10-09 20:11:16.855690475 +1030
@@ -9,7 +9,8 @@
#ifndef DENA_AUTO_ADDRINFO_HPP
#define DENA_AUTO_ADDRINFO_HPP
......@@ -11,9 +11,9 @@ diff -uNr mariadb-10.3.13/plugin/handler_socket/libhsclient/auto_addrinfo.hpp ma
#include <sys/socket.h>
#include <netdb.h>
#include <string.h>
diff -uNr mariadb-10.3.13/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb-10.3.13-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp
--- mariadb-10.3.13/plugin/handler_socket/libhsclient/hstcpcli.cpp 2019-02-20 18:29:11.000000000 +1030
+++ mariadb-10.3.13-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp 2018-05-17 07:01:11.000000000 +0930
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
--- mariadb-10.4.6/plugin/handler_socket/libhsclient/hstcpcli.cpp 2019-06-18 07:30:32.000000000 +0930
+++ mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/hstcpcli.cpp 2019-10-09 20:11:17.056690968 +1030
@@ -6,7 +6,8 @@
* See COPYRIGHT.txt for details.
*/
......@@ -24,9 +24,9 @@ diff -uNr mariadb-10.3.13/plugin/handler_socket/libhsclient/hstcpcli.cpp mariadb
#include <stdexcept>
#include "hstcpcli.hpp"
diff -uNr mariadb-10.3.13/plugin/handler_socket/libhsclient/socket.cpp mariadb-10.3.13-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp
--- mariadb-10.3.13/plugin/handler_socket/libhsclient/socket.cpp 2019-02-20 18:29:11.000000000 +1030
+++ mariadb-10.3.13-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp 2018-05-17 07:01:11.000000000 +0930
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
--- mariadb-10.4.6/plugin/handler_socket/libhsclient/socket.cpp 2019-06-18 07:30:32.000000000 +0930
+++ mariadb-10.4.6-without_server_fix/plugin/handler_socket/libhsclient/socket.cpp 2019-10-09 20:11:18.245693883 +1030
@@ -6,10 +6,13 @@
* 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