mariadb: Update from 10.3.7 to 10.3.8

This commit is contained in:
Fredrik Fornwall 2018-07-23 01:26:38 +02:00
parent fa94d6ba31
commit 4474709169
5 changed files with 31 additions and 20 deletions

View File

@ -1,11 +1,11 @@
diff -u -r ../mariadb-10.2.7/CMakeLists.txt ./CMakeLists.txt
--- ../mariadb-10.2.7/CMakeLists.txt 2017-07-10 10:53:26.000000000 +0000
+++ ./CMakeLists.txt 2017-08-09 23:44:24.691181837 +0000
@@ -386,7 +386,6 @@
diff -u -r ../mariadb-10.3.8/CMakeLists.txt ./CMakeLists.txt
--- ../mariadb-10.3.8/CMakeLists.txt 2018-07-02 07:34:08.000000000 +0000
+++ ./CMakeLists.txt 2018-07-03 11:15:40.073729412 +0000
@@ -397,7 +397,6 @@
OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
IF(WITH_EMBEDDED_SERVER)
ADD_SUBDIRECTORY(libmysqld)
- ADD_SUBDIRECTORY(libmysqld/examples)
ADD_SUBDIRECTORY(unittest/embedded)
ENDIF(WITH_EMBEDDED_SERVER)
IF(WITH_WSREP)

View File

@ -1,14 +1,14 @@
TERMUX_PKG_HOMEPAGE=https://mariadb.org
TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
TERMUX_PKG_VERSION=10.3.7
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=e990afee6ae7cf9ac40154d0e150be359385dd6ef408ad80ea30df34e2c164cf
TERMUX_PKG_VERSION=10.3.8
TERMUX_PKG_SHA256=30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8
TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DBISON_EXECUTABLE=`which bison`
-DGETCONF=`which getconf`
-DBUILD_CONFIG=mysql_release
-DCAT_EXECUTABLE=`which cat`
-DGIT_EXECUTABLE=`which git`
-DGSSAPI_FOUND=NO
-DGRN_WITH_LZ4=no
-DENABLED_LOCAL_INFILE=ON
@ -42,6 +42,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DWITH_INNODB_LZO=OFF
-DWITH_INNODB_SNAPPY=OFF
-DWITH_UNIT_TESTS=OFF
-DINSTALL_SYSCONFDIR=$TERMUX_PREFIX/etc
"
TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_DEPENDS="liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob"

View File

@ -0,0 +1,11 @@
diff -u -r ../mariadb-10.3.8/cmake/install_layout.cmake ./cmake/install_layout.cmake
--- ../mariadb-10.3.8/cmake/install_layout.cmake 2018-07-02 09:34:08.000000000 +0200
+++ ./cmake/install_layout.cmake 2018-07-22 23:28:13.863668234 +0200
@@ -172,7 +172,6 @@
SET(INSTALL_SBINDIR_DEB "sbin")
SET(INSTALL_SCRIPTDIR_DEB "bin")
SET(INSTALL_SYSCONFDIR_DEB "/etc")
-SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/conf.d")
#
SET(INSTALL_LIBDIR_DEB "lib")
SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin")

View File

@ -1,15 +1,3 @@
diff -u -r ./cmake/install_layout.cmake ../src.orig/cmake/install_layout.cmake
--- ./cmake/install_layout.cmake 2017-10-30 08:10:43.000000000 +0000
+++ ../src.orig/cmake/install_layout.cmake 2017-12-09 20:12:27.748617252 +0000
@@ -135,7 +135,7 @@
SET(INSTALL_SBINDIR_RPM "sbin")
SET(INSTALL_SCRIPTDIR_RPM "bin")
SET(INSTALL_SYSCONFDIR_RPM "/etc")
-SET(INSTALL_SYSCONF2DIR_RPM "/etc/my.cnf.d")
+SET(INSTALL_SYSCONF2DIR_RPM "@TERMUX_PREFIX@/etc/my.cnf.d")
#
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(INSTALL_LIBDIR_RPM "lib64")
diff -u -r ./support-files/mysql-multi.server.sh ../src.orig/support-files/mysql-multi.server.sh
--- ./support-files/mysql-multi.server.sh 2017-10-30 08:10:49.000000000 +0000
+++ ../src.orig/support-files/mysql-multi.server.sh 2017-12-09 20:12:10.456623540 +0000

View File

@ -0,0 +1,11 @@
diff -u -r ../mariadb-10.3.8/sql/CMakeLists.txt ./sql/CMakeLists.txt
--- ../mariadb-10.3.8/sql/CMakeLists.txt 2018-07-02 07:34:11.000000000 +0000
+++ ./sql/CMakeLists.txt 2018-07-22 21:00:22.913542838 +0000
@@ -388,6 +388,7 @@
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
${CMAKE_CURRENT_BINARY_DIR}/lex_token.h
+ ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc
)