merge

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=138

build.inc

@@ -101,9 +101,9 @@ BuildMySQL() {
 	shift
 	cmake -DWITH_SSL=system                                            \
 			-DWITH_ZLIB=system                                           \
+			-DWITH_JEMALLOC=no                                           \
 			-DWITH_READLINE=0                                            \
 			-DWITH_LIBEDIT=0                                             \
-			-DWITH_JEMALLOC=no                                           \
 			-DINSTALL_LAYOUT=RPM                                         \
 			-DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock                   \
 			-DINSTALL_MYSQLSHAREDIR=share/%{name}                        \
@@ -112,7 +112,6 @@ BuildMySQL() {
 			-DDEFAULT_CHARSET=utf8  -DDEFAULT_COLLATION=utf8_general_ci  \
 			-DWITH_INNOBASE_STORAGE_ENGINE=1                             \
 			-DWITH_PERFSCHEMA_STORAGE_ENGINE=1                           \
-			-DWITH_TOKUDB_STORAGE_ENGINE=0                               \
 			-DWITH_EMBEDDED_SERVER=true                                  \
 			-DCOMPILATION_COMMENT="openSUSE package"                     \
 			-DDENABLE_DOWNLOADS=false                                    \

configuration-tweaks.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b7f727533c3539b52bd6a5855cf27293e6e05498b36eb3c4bd0d95beee2426f
-size 317
+oid sha256:5177b4039c26fac5d77e6c9162b233d34a5cdc36fc8ee638b5770e27dd047854
+size 308

install.inc

@@ -155,5 +155,5 @@ if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
 	echo '%%_libdir/mysql/plugin/dialog*.so'   >> mysql-client.files
 fi
 rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}*
-rm -f '%buildroot'/usr/share/doc/* 2> /dev/null || true
+rm -f  '%buildroot'/usr/share/doc/* 2> /dev/null || true
 rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux}

mariadb.spec

@@ -64,7 +64,6 @@ BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
-BuildRequires:  jemalloc-devel
 BuildRequires:  libaio-devel
 BuildRequires:  libedit-devel
 BuildRequires:  libtool
@@ -404,6 +403,7 @@ done
 %endif
 # Broken test that needs sources
 rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
+# Present only in newer MariaDB, big change, needs fixing & testing
 rm -rf storage/tokudb
 
 %build

mysql-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7db604f5d9fd07c548d8041b6dbe8442d5a4b30fb4e271e522518a0eba4c5d5
-size 12365
+oid sha256:b688747b56f22916e03ddadf70ce53b0847d2bd8b29af671910db3b18ffcac7a
+size 12393