From ce964caa09e51781a972138b8cf806b24903eb652ffc65dc7cae47a46755765a Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Wed, 18 Sep 2013 21:34:55 +0000 Subject: [PATCH] - fixed commenting out of incompatible options - updated to MariaDB 5.5.32 * Release notes: http://kb.askmonty.org/v/mariadb-5532-release-notes * Changelog: http://kb.askmonty.org/v/mariadb-5532-changelog * not using TokuDB and jmalloc OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=136 --- build.inc | 2 ++ configuration-tweaks.tar.bz2 | 4 ++-- install.inc | 1 + mariadb.changes | 11 +++++++++++ mariadb.spec | 6 ++++-- mysql-patches.tar.bz2 | 4 ++-- rc.mysql-multi | 6 ++++-- series | 3 +-- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/build.inc b/build.inc index 4164e23..034f0fb 100644 --- a/build.inc +++ b/build.inc @@ -103,6 +103,7 @@ BuildMySQL() { -DWITH_ZLIB=system \ -DWITH_READLINE=0 \ -DWITH_LIBEDIT=0 \ + -DWITH_JEMALLOC=no \ -DINSTALL_LAYOUT=RPM \ -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \ -DINSTALL_MYSQLSHAREDIR=share/%{name} \ @@ -111,6 +112,7 @@ 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 \ diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 8727b0b..704046b 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a4e38d09d75f8507118bcb49961094e07fb5c4a2b7b9d44e8ce864371633391 -size 312 +oid sha256:4b7f727533c3539b52bd6a5855cf27293e6e05498b36eb3c4bd0d95beee2426f +size 317 diff --git a/install.inc b/install.inc index ae97745..30fb289 100644 --- a/install.inc +++ b/install.inc @@ -155,4 +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 -rf '%buildroot'/usr/share/mysql/{solaris,SELinux} diff --git a/mariadb.changes b/mariadb.changes index d614b8d..9b4c9e0 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Sep 18 23:33:33 CEST 2013 - mhrusecky@suse.cz + +- fixed commenting out of incompatible options +- updated to MariaDB 5.5.32 + * Release notes: + http://kb.askmonty.org/v/mariadb-5532-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-5532-changelog + * not using TokuDB and jmalloc + ------------------------------------------------------------------- Mon Sep 9 10:37:12 CEST 2013 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index ade6019..445fcc6 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -35,9 +35,9 @@ Name: mariadb Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers -Version: 5.5.32 +Version: 5.5.33 Release: 0 -%define srv_vers 5.5.32 +%define srv_vers 5.5.33 Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf @@ -64,6 +64,7 @@ BuildRequires: automake BuildRequires: bison BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: jemalloc-devel BuildRequires: libaio-devel BuildRequires: libedit-devel BuildRequires: libtool @@ -403,6 +404,7 @@ done %endif # Broken test that needs sources rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result +rm -rf storage/tokudb %build %{expand:%(cat %_sourcedir/build.inc)} diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index 08436fb..fe489cd 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3babe0e59c8fdda2a73560f88ab80c159a9d15f691582418b4648d2a9b6e68b6 -size 13330 +oid sha256:f7db604f5d9fd07c548d8041b6dbe8442d5a4b30fb4e271e522518a0eba4c5d5 +size 12365 diff --git a/rc.mysql-multi b/rc.mysql-multi index ab74ee0..bad8fe1 100644 --- a/rc.mysql-multi +++ b/rc.mysql-multi @@ -370,8 +370,8 @@ else echo >> "$log_upgrade" echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade" echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade" - sed -i -e 's|^\([^#]*skip-locking\)|\1\nskip-external-locking|' \ - -e 's|^\([^#]*skip-federated\)|#\1|' /etc/my.cnf + sed -i -e 's|^\([[:blank:]]*\)skip-locking|\1skip-external-locking|' \ + -e 's|^\([[:blank:]]*skip-federated\)|#\1|' /etc/my.cnf # Check logs for inconsistencies SRCLOGS="" ALL_SRCLOGS="" @@ -484,6 +484,8 @@ else chmod 750 "$datadir" chown -R --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$datadir" rm -f /var/adm/update-messages/mysql-* + [ "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ] || \ + echo -n "$MYSQLVER" "$datadir/mysql_upgrade_info" rm -f /var/lib/mysql/.run-mysql_upgrade rm -f /var/lib/mysql/.force_upgrade rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past diff --git a/series b/series index 94a895b..b2acb3f 100644 --- a/series +++ b/series @@ -9,6 +9,5 @@ mariadb-5.5.32-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch mariadb-5.5.28-group.patch -mariadb-5.5.32-deharcode-libdir.patch +mariadb-5.5.33-deharcode-libdir.patch mysql-5.5.31-upgrade-datadir.patch -mysql-5.5-dump.patch