From a26540d61c77fee92e2fde254d7b3343df22fd03 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 30 Jun 2018 20:01:08 +0200 Subject: [PATCH] mariadb: bump to 10.1.34 - bump version (100% backward compatible) - add modules - small misc improvements Signed-off-by: Sebastian Kemper --- utils/mariadb/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 545daba01..98dde04ac 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.1.33 +PKG_VERSION:=10.1.34 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -18,7 +18,7 @@ PKG_SOURCE_URL := \ https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \ https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source -PKG_HASH:=94312c519f2c0c25e1964c64e22aff0036fb22dfb2685638f43a6b2211395d2d +PKG_HASH:=c7e0719fd08790c096585bf867fe87e084b310f2f3679e059e3b10b9fd6d5548 PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -61,6 +61,8 @@ MARIADB_SERVER_PLUGINS := \ ha_federated \ ha_federatedx \ ha_innodb \ + ha_sequence \ + ha_sphinx \ ha_spider \ ha_test_sql_discovery \ handlersocket \ @@ -103,6 +105,8 @@ plugin-ha_example := PLUGIN_EXAMPLE plugin-ha_federated := PLUGIN_FEDERATED plugin-ha_federatedx := PLUGIN_FEDERATEDX plugin-ha_innodb := PLUGIN_INNOBASE +plugin-ha_sequence := PLUGIN_SEQUENCE +plugin-ha_sphinx := PLUGIN_SPHINX plugin-ha_spider := PLUGIN_SPIDER plugin-ha_test_sql_discovery := PLUGIN_TEST_SQL_DISCOVERY plugin-handlersocket := PLUGIN_HANDLERSOCKET @@ -371,7 +375,6 @@ CMAKE_OPTIONS += \ -DPLUGIN_MROONGA=NO \ -DPLUGIN_OQGRAPH=NO \ -DPLUGIN_ROCKSDB=NO \ - -DPLUGIN_SPHINX=NO \ -DPLUGIN_TOKUDB=NO \ -DPLUGIN_AUTH_PAM=NO \ -DPLUGIN_AUTH_GSSAPI=NO \ @@ -441,6 +444,10 @@ endef define Package/mariadb-client/install $(INSTALL_DIR) $(1)/usr/bin $(foreach b,$(MARIADB_CLIENT),$(call Package/mariadb/install/bin,$(1),$(b));) + # Install convenience links for mysqlcheck multi-call binary + cd $(1)/usr/bin; $(LN) mysqlcheck mysqlanalyze + cd $(1)/usr/bin; $(LN) mysqlcheck mysqlrepair + cd $(1)/usr/bin; $(LN) mysqlcheck mysqloptimize endef define Package/mariadb-client-extra/install @@ -478,7 +485,7 @@ endef define Package/mariadb-server/conffiles /etc/mysql/my.cnf -/usr/lib/mysql/plugin/daemon_example.ini +$(PLUGIN_DIR)/daemon_example.ini endef define BuildPlugin @@ -525,9 +532,12 @@ $(eval $(call BuildPlugin,file_key_management,)) $(eval $(call BuildPlugin,ha_archive,)) $(eval $(call BuildPlugin,ha_blackhole,)) $(eval $(call BuildPlugin,ha_connect,+libxml2)) +$(eval $(call BuildPlugin,ha_example,)) $(eval $(call BuildPlugin,ha_federated,)) $(eval $(call BuildPlugin,ha_federatedx,)) $(eval $(call BuildPlugin,ha_innodb,)) +$(eval $(call BuildPlugin,ha_sequence,)) +$(eval $(call BuildPlugin,ha_sphinx,)) $(eval $(call BuildPlugin,ha_spider,)) $(eval $(call BuildPlugin,ha_test_sql_discovery,)) $(eval $(call BuildPlugin,handlersocket,))