diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-21 10:14:45 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-21 10:14:45 +0200 |
| commit | 564593462ea4dd96fbe4842469b7a0da920a13f2 (patch) | |
| tree | 18b2e3b9ece473535048dc17c7282662427e6108 /libre | |
| parent | 81cc989543d935f11be84b3fb0696a57c2d9abd2 (diff) | |
| parent | 905dec08e7144fe77aad1161778a6c3b74ff305c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/openssl/PKGBUILD
extra/scim/PKGBUILD
extra/vim/PKGBUILD
testing/cogl/PKGBUILD
testing/kmod/PKGBUILD
testing/rhythmbox/PKGBUILD
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/mariadb/PKGBUILD | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index df4bb9a16..a5b733e9f 100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=mariadb _pkgbase=MariaDB pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") pkgver=5.5.23 -pkgrel=1.4 +pkgrel=1.5 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.${pkgbase}.org/" @@ -39,7 +39,7 @@ build() { -DMYSQL_DATADIR=/var/lib/${falsename} \ -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ + -DDEFAULT_COLLATION=utf8_unicode_ci \ -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/${falsename}/docs \ -DINSTALL_MANDIR=share/man \ @@ -60,6 +60,7 @@ build() { -DWITH_EMBEDDED_SERVER=ON \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_PBXT_STORAGE_ENGINE=1 \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ |