- updated to MariaDB 5.1.47

- based on MySQL 5.1.47 maintenance update
  - changelog:
    http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Changelog
  - release notes:
    http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Release_Notes

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=23

mariadb-5.1.44b.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2af7c99965a90f8f32b11516391ee46a80d0cb30221797e9190ff563f95c0cfa
-size 16752425

mariadb-5.1.47.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:127eaf2c00f933d78c7fc3b7434abcb7e278d79082cd1ec63f6655c48bfcd329
+size 17342793

mariadb.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun  2 10:38:05 CEST 2010 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.1.47
+  - based on MySQL 5.1.47 maintenance update
+  - changelog:
+    http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Changelog
+  - release notes:
+    http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Release_Notes
+
 -------------------------------------------------------------------
 Wed May 26 14:02:25 CEST 2010 - mhrusecky@suse.cz
 

mariadb.spec

@@ -20,7 +20,7 @@
 # Few definitions which will alter build
 %define prefered   0
 %define cluster    0
-%define srv_vers   5.1.44
+%define srv_vers   5.1.47
 
 %if %{?rel:0}%{!?rel:1}
 %define rel 1
@@ -31,13 +31,13 @@
 
 Name:           mariadb
 Summary:        A True Multiuser, Multithreaded SQL Database Server
-Version:        5.1.44
+Version:        5.1.47
-Release:        2
+Release:        0
 License:        GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Productivity/Databases/Servers
 Url:            http://www.mysql.com
-# http://dev.mysql.com/get/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz/from/pick
+# http://askmonty.org/downloads/r/http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.47/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz
-Source:         mariadb-%{version}b.tar.bz2
+Source:         mariadb-%{version}.tar.bz2
 Source2:        baselibs.conf
 Source3:        README.debug
 Source4:        suse-test-run
@@ -74,7 +74,7 @@ Patch28:        mysql-5.1.42-myslq-test.patch
 # http://bugs.mysql.com/bug.php?id=45616
 Patch29:        mysql-5.1.33-scripts-paths.patch
 # PATCH-FIX-SUSE mysql-5.1.33-safe-process-in-bin.patch [] mhrusecky@suse.cz -- this will let us move one binary to /usr/bin instead of /usr/share/mysql-test/...
-Patch30:        mysql-5.1.33-safe-process-in-bin.patch
+Patch30:        mysql-5.1.45-safe-process-in-bin.patch
 # PATCH-FIX-SUSE mysql-5.1.33-ssl-lib64-macro.patch [] mhrusecky@suse.cz -- search for ssl libraries also in lib64
 Patch31:        mysql-5.1.33-ssl-lib64-macro.patch
 # PATCH-FIX-SUSE mysql-5.1.35-test-utf8.patch [] mhrusecky@suse.cz -- we use utf-8 by default which produces different output with few tests
@@ -416,7 +416,7 @@ advanced user.  They should be used with caution.
 
 %prep
 #-------------------------------------------------------------------------------
-%setup -q -n mariadb-%{version}b
+%setup -q -n mariadb-%{version}
 cp %_sourcedir/README.SuSE .
 cp %_sourcedir/suse-test-run .
 %patch2

mysql-5.1.33-safe-process-in-bin.patch

@@ -1,20 +0,0 @@
---- mysql-test/lib/My/SafeProcess.pm	2009-04-03 15:14:38.000000000 +0200
-+++ mysql-test/lib/My/SafeProcess.pm	2009-03-13 22:49:26.000000000 +0100
-@@ -86,7 +86,7 @@
- my $safe_kill;
- if (IS_WIN32PERL or IS_CYGWIN){
-   # Use my_safe_process.exe
-+  my $exe= my_find_bin(".", ["../../bin","lib/My/SafeProcess", "My/SafeProcess"],
--  my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
- 		       "my_safe_process");
-   push(@safe_process_cmd, $exe);
- 
-@@ -96,7 +96,7 @@
- else
- {
-   # Use my_safe_process
-+  my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"],
--  my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
- 		       "my_safe_process");
-   push(@safe_process_cmd, $exe);
- }

mysql-5.1.45-safe-process-in-bin.patch

@@ -0,0 +1,22 @@
+Index: mysql-test/lib/My/SafeProcess.pm
+===================================================================
+--- mysql-test/lib/My/SafeProcess.pm.orig
++++ mysql-test/lib/My/SafeProcess.pm
+@@ -89,7 +89,7 @@ sub find_bin {
+   if (IS_WIN32PERL or IS_CYGWIN)
+   {
+     # Use my_safe_process.exe
+-    my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
++    my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"],
+ 			 "my_safe_process");
+     push(@safe_process_cmd, $exe);
+ 
+@@ -99,7 +99,7 @@ sub find_bin {
+   else
+   {
+     # Use my_safe_process
+-    my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
++    my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"],
+ 			 "my_safe_process");
+     push(@safe_process_cmd, $exe);
+   }