mariadb: update to 10.6.4
This commit is contained in:
parent
ba717665bc
commit
8c782569a9
@ -1,11 +1,12 @@
|
||||
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)
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b8b3f5c7d..0d8401253 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -453,7 +453,6 @@ IF(NOT WITHOUT_SERVER)
|
||||
OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
|
||||
IF(WITH_EMBEDDED_SERVER)
|
||||
ADD_SUBDIRECTORY(libmysqld)
|
||||
- ADD_SUBDIRECTORY(libmysqld/examples)
|
||||
ADD_SUBDIRECTORY(unittest/embedded)
|
||||
ENDIF(WITH_EMBEDDED_SERVER)
|
||||
|
||||
IF(NOT WIN32)
|
||||
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org
|
||||
TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
|
||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=2:10.5.8
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_VERSION=2:10.6.4
|
||||
TERMUX_PKG_SRCURL=http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-${TERMUX_PKG_VERSION:2}/source/mariadb-${TERMUX_PKG_VERSION:2}.tar.gz
|
||||
TERMUX_PKG_SHA256=eb4824f6f2c532cd3fc6a6bce7bf78ea7c6b949f8bdd07656b2c84344e757be8
|
||||
TERMUX_PKG_SHA256=75bf9b147a95d38160d01a73b098d50a1960563b46d16a235971fff64d99643c
|
||||
TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre2, libcrypt, libandroid-support, libandroid-glob, zlib, liblz4"
|
||||
TERMUX_PKG_BREAKS="mariadb-dev"
|
||||
TERMUX_PKG_REPLACES="mariadb-dev"
|
||||
@ -61,6 +60,7 @@ TERMUX_PKG_CONFLICTS="mysql"
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="
|
||||
bin/mysqltest*
|
||||
share/man/man1/mysql-test-run.pl.1
|
||||
share/mysql/mysql-test
|
||||
mysql-test
|
||||
sql-bench
|
||||
"
|
||||
|
@ -1,11 +0,0 @@
|
||||
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
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user