[mariadb-galera] Rebase to version 10.0.13
Honza Horak
hhorak at fedoraproject.org
Mon Sep 8 13:56:49 UTC 2014
commit ec54606b87bce07a1a59b2aa6bfcc2659c98bdbb
Author: Honza Horak <hhorak at redhat.com>
Date: Mon Sep 8 15:56:05 2014 +0200
Rebase to version 10.0.13
.gitignore | 1 +
mariadb-file-contents.patch | 9 ++++-----
mariadb-galera.spec | 2 +-
sources | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c336fb9..c7cd1e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/mariadb-galera-5.5.37.tar.gz
/mariadb-galera-5.5.38.tar.gz
/mariadb-galera-10.0.12.tar.gz
+/mariadb-galera-10.0.13.tar.gz
diff --git a/mariadb-file-contents.patch b/mariadb-file-contents.patch
index 441f4f0..18823eb 100644
--- a/mariadb-file-contents.patch
+++ b/mariadb-file-contents.patch
@@ -6,10 +6,9 @@ to know about this.
Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
-diff -up mariadb-10.0.12/mysql-test/t/file_contents.test.file_contents mariadb-10.0.12/mysql-test/t/file_contents.test.
-diff -up mariadb-10.0.12/mysql-test/t/file_contents.test.file_contents mariadb-10.0.12/mysql-test/t/file_contents.test
---- mariadb-10.0.12/mysql-test/t/file_contents.test.file_contents 2014-06-12 11:26:03.000000000 +0200
-+++ mariadb-10.0.12/mysql-test/t/file_contents.test 2014-07-24 23:53:49.833176793 +0200
+diff -up mariadb-10.0.13/mysql-test/t/file_contents.test.p6 mariadb-10.0.13/mysql-test/t/file_contents.test
+--- mariadb-10.0.13/mysql-test/t/file_contents.test.p6 2014-08-31 14:18:49.000000000 +0200
++++ mariadb-10.0.13/mysql-test/t/file_contents.test 2014-09-08 14:37:55.421609500 +0200
@@ -11,7 +11,7 @@
--perl
print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
@@ -30,7 +29,7 @@ diff -up mariadb-10.0.12/mysql-test/t/file_contents.test.file_contents mariadb-1
if(-d "$dir_docs/packages") {
@@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
# RedHat/Debian: version number in directory name
- $dir_docs = glob "$dir_docs/mariadb-server-*";
+ $dir_docs = glob "$dir_docs/mariadb-galera-server-*";
$dir_docs = glob "$dir_docs/MySQL-server*" unless -d $dir_docs;
+
+ # All the above is entirely wacko, because these files are not docs;
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index fa9706b..82be775 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -797,7 +797,7 @@ mysqlshow,mysqlslap,my_print_defaults,aria_chk,aria_dump_log,aria_ftdump,\
aria_pack,aria_read_log}
rm -f %{buildroot}%{_mandir}/man1/{mysql,mysql_find_rows,mysql_waitpid,\
mysqlaccess,mysqladmin,mysqldump,mysqlshow,mysqlslap,\
-my_print_defaults}.1*
+my_print_defaults,aria_chk,aria_dump_log,aria_ftdump,aria_pack,aria_read_log}.1*
rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/{client,connect}.cnf
%endif
diff --git a/sources b/sources
index c26dd29..0855658 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d142630c565a75d1b1b44246beb2923 mariadb-galera-10.0.12.tar.gz
+efe28befea02afee96317b8b760f3706 mariadb-galera-10.0.13.tar.gz
More information about the scm-commits
mailing list