[mariadb/el5: 7/7] Merge branch 'el6' into el5

[Honza Horak]

commit 860c7159b400bf2dc6e7eaac19564e8842746e82
Merge: 3ff16e1 9532e9f
Author: Honza Horák <hhorak at redhat.com>
Date:   Tue Jun 4 13:53:23 2013 +0200

    Merge branch 'el6' into el5
    
    Conflicts:
    	mariadb.spec

 .gitignore            |    1 +
 mariadb-basedir.patch |   15 +++++++++
 mariadb-buffer.patch  |   24 --------------
 mariadb.spec          |   82 +++++++++++++-----------------------------------
 sources               |    2 +-
 5 files changed, 39 insertions(+), 85 deletions(-)
---
diff --cc mariadb.spec
index a9f9e9c,6cbd8bd..9b9a712
--- a/mariadb.spec
+++ b/mariadb.spec
@@@ -49,11 -43,11 +43,11 @@@ Patch10: mariadb-file-contents.patc
  Patch11: mariadb-string-overflow.patch
  Patch12: mariadb-dh1024.patch
  Patch13: mariadb-man-plugin.patch
- Patch14: mariadb-buffer.patch
+ Patch14: mariadb-basedir.patch
  
 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
  BuildRequires: perl, readline-devel, openssl-devel
  BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
 -BuildRequires: systemtap-sdt-devel
  # make test requires time and ps
  BuildRequires: time procps
  # perl modules needed to run regression tests
@@@ -743,10 -691,10 +701,14 @@@ f
  %{_mandir}/man1/mysql_client_test.1*
  
  %changelog
+ * Mon Jun  3 2013 Honza Horak <hhorak at redhat.com> 5.5.31-1
+ - Rebase to 5.5.31
+   https://kb.askmonty.org/en/mariadb-5531-changelog/
+ 
 +* Wed Feb 27 2013 Honza Horak <hhorak at redhat.com> 5.5.29-7
 +- Remove BuildRequires on systemtap-sdt-devel
 +- Using RHEL-5 specific macros
 +
  * Wed Feb 20 2013 Honza Horak <hhorak at redhat.com> 5.5.29-6
  - Remove systemd unit file and use init script instead