Commit 850ba763 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated mariadb to 10.3.13

parent 19ca92f1
all:
client:
dd if=/dev/zero of=swap bs=1048576 count=1024
chmod 600 swap
mkswap swap
swapon swap
tar xf mariadb-10.2.15.tar.gz
cd mariadb-10.2.15 && sed -i "s@data/test@\$${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt
mkdir mariadb-10.2.15/build
cd mariadb-10.2.15/build && cmake -DCMAKE_BUILD_TYPE=Release -DINSTALL_LAYOUT=DEB -DWITH_EXTRA_CHARSETS=complex -DSKIP_TESTS=ON -DWITHOUT_SERVER=ON -DTOKUDB_OK=0 ..
$(MAKE) -C mariadb-10.2.15/build
$(MAKE) -C mariadb-10.2.15/build test
$(MAKE) -C mariadb-10.2.15/build install
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 -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
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.2.15
rm -rf mariadb-10.3.13
swapoff swap
rm -rf swap
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
@@ -9,7 +9,8 @@
#ifndef DENA_AUTO_ADDRINFO_HPP
#define DENA_AUTO_ADDRINFO_HPP
-#include <my_global.h>
+#include <my_config.h>
+#include <sys/types.h>
#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
@@ -6,7 +6,8 @@
* See COPYRIGHT.txt for details.
*/
-#include <my_global.h>
+#include <my_config.h>
+
#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
@@ -6,10 +6,13 @@
* See COPYRIGHT.txt for details.
*/
-#include <my_global.h>
+#include <my_config.h>
#include <stdexcept>
#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
#include <signal.h>
#include <sys/un.h>
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