From 092ba47173cef70bdbfdedad498b5a3306d80be36e11009da2a42426830b3cdf Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Tue, 23 Jul 2013 09:04:35 +0000
Subject: [PATCH] update

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=118
---
 configuration-tweaks.tar.bz2 |  4 ++--
 mariadb-5.5.31.tar.bz2       |  3 ---
 mariadb-5.5.32.tar.bz2       |  3 +++
 mariadb.changes              |  9 +++++++++
 mariadb.spec                 | 13 +++----------
 my.ini                       |  3 +++
 mysql-patches.tar.bz2        |  4 ++--
 series                       |  2 +-
 8 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 mariadb-5.5.31.tar.bz2
 create mode 100644 mariadb-5.5.32.tar.bz2

diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 742d2d5..479f499 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:ac5ba7427aed3e005cc0f19dabb58c1e69856c054d3016adf538b46c1df2d2e9
-size 312
+oid sha256:b2b4528bfd705dccf6be532a58ace71daff468b7e2777a01f569836a29552488
+size 323
diff --git a/mariadb-5.5.31.tar.bz2 b/mariadb-5.5.31.tar.bz2
deleted file mode 100644
index f50054b..0000000
--- a/mariadb-5.5.31.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac2307d6d6939d8564af8bf5b097870fc8d9819684cedb811005b87f8a363e46
-size 21327911
diff --git a/mariadb-5.5.32.tar.bz2 b/mariadb-5.5.32.tar.bz2
new file mode 100644
index 0000000..f38799a
--- /dev/null
+++ b/mariadb-5.5.32.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ae38e45391899f5377ed75e6974100af165f654842517db2b53033159257d72
+size 21314660
diff --git a/mariadb.changes b/mariadb.changes
index 5269aa9..9058c97 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul 23 10:28:10 CEST 2013 - mhrusecky@suse.cz
+
+- 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
+
 -------------------------------------------------------------------
 Thu Jun  6 13:22:37 UTC 2013 - mhrusecky@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index de682d0..72aa499 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.31
+Version:        5.5.32
 Release:        0
-%define srv_vers 5.5.31
+%define srv_vers 5.5.32
 Url:            http://www.mariab.org
 Source:         mariadb-%{version}.tar.bz2
 Source2:        baselibs.conf
@@ -416,16 +416,9 @@ if posix.access("/usr/sbin/rcmysql", "x") then
     os.execute("/bin/mkdir -p /var/run/mysql/restart")
   end
 end
-dbfile="var/mysql/mysql/db.ISM"
-olddir="var/mysql"
-newdir="var/lib/mysql"
--- Do the database files still belong to root (very old installation)?
--- Change ownerships
-if posix.stat(dbfile, "uid") == 0 then
-  os.execute("/bin/chown -Rv mysql:mysql var/mysql/")
-end
 
 %posttrans
+[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \
 %install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.*
 if [ -d /var/lib/mysql ]; then
 	touch /var/lib/mysql/.run-mysql_upgrade
diff --git a/my.ini b/my.ini
index a863018..1f2d878 100644
--- a/my.ini
+++ b/my.ini
@@ -10,6 +10,9 @@
 
 [mysqld]
 
+# Remove leading # if you don't want to listen on network (only socket - safer)
+# skip-networking
+
 # Remove leading # and set to the amount of RAM for the most important data
 # cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
 # innodb_buffer_pool_size = 128M
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 6155a3a..446b786 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:2a44cd8a364876bd0dca1b99b63374f75bd6eca42c68c018e69429263d2f533d
-size 11797
+oid sha256:2b34d03c24091c0a8120aae545ac9f0959b4167c21e7a1954819836bdf66a673
+size 11823
diff --git a/series b/series
index 3379ebd..252baca 100644
--- a/series
+++ b/series
@@ -5,7 +5,7 @@ mariadb-5.1.50-strncat-overflow.patch
 mariadb-5.5.28-install_db-quiet.patch
 mysql-community-server-5.1.51-mysql_config.patch
 mariadb-5.5.25-mysqld_multi-features.patch
-mariadb-5.1.50-upgrade-exit-status.patch
+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