rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

merge

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=138
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2013-09-19 07:25:31 +00:00 committed by Git OBS Bridge
parent f1a35dce36
commit d01f3661e4
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.inc
View File

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

4
configuration-tweaks.tar.bz2
View File

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

2
mariadb.spec
View File

@ -64,7 +64,6 @@ BuildRequires: automake
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: jemalloc-devel
BuildRequires: libaio-devel BuildRequires: libaio-devel
BuildRequires: libedit-devel BuildRequires: libedit-devel
BuildRequires: libtool BuildRequires: libtool
@ -404,6 +403,7 @@ done
%endif %endif
# Broken test that needs sources # Broken test that needs sources
rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result 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 rm -rf storage/tokudb
%build %build

4
mysql-patches.tar.bz2
View File

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