From d6a8f7fcc46b415e25c64c45add66edbe8ca2a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Dor=C5=88=C3=A1k?= Date: Wed, 14 May 2014 14:05:26 +0200 Subject: [PATCH] Rebase to version 10.0.11 --- .gitignore | 1 + mariadb-cipherspec.patch | 12 ++++++------ mariadb.spec | 9 ++++++--- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 48adbbc..485d1e7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /mariadb-5.5.35.tar.gz /mariadb-5.5.36.tar.gz /mariadb-10.0.10.tar.gz +/mariadb-10.0.11.tar.gz diff --git a/mariadb-cipherspec.patch b/mariadb-cipherspec.patch index 55804bd..f2d5e12 100644 --- a/mariadb-cipherspec.patch +++ b/mariadb-cipherspec.patch @@ -4,10 +4,10 @@ This patch enhances connect command by an option to specify a cipher and tests are adjusted to specify the expected cipher explicitly. Upstream bug report: http://bugs.mysql.com/bug.php?id=64461 -diff -up --recursive mariadb-10.0.10.p6/client/mysqltest.cc mariadb-10.0.10/client/mysqltest.cc ---- mariadb-10.0.10.p6/client/mysqltest.cc 2014-03-30 19:56:39.000000000 +0200 -+++ mariadb-10.0.10/client/mysqltest.cc 2014-04-07 17:21:33.840148449 +0200 -@@ -5872,6 +5872,7 @@ void do_connect(struct st_command *comma +diff -up --recursive mariadb-10.0.11.p6/client/mysqltest.cc mariadb-10.0.11/client/mysqltest.cc +--- mariadb-10.0.11.p6/client/mysqltest.cc 2014-05-14 13:48:57.021925254 +0200 ++++ mariadb-10.0.11/client/mysqltest.cc 2014-05-14 13:55:20.192711847 +0200 +@@ -5908,6 +5908,7 @@ void do_connect(struct st_command *comma my_bool con_pipe= 0; my_bool con_shm __attribute__ ((unused))= 0; struct st_connection* con_slot; @@ -15,7 +15,7 @@ diff -up --recursive mariadb-10.0.10.p6/client/mysqltest.cc mariadb-10.0.10/clie static DYNAMIC_STRING ds_connection_name; static DYNAMIC_STRING ds_host; -@@ -5962,6 +5963,8 @@ void do_connect(struct st_command *comma +@@ -5998,6 +5999,8 @@ void do_connect(struct st_command *comma con_pipe= 1; else if (length == 3 && !strncmp(con_options, "SHM", 3)) con_shm= 1; @@ -24,7 +24,7 @@ diff -up --recursive mariadb-10.0.10.p6/client/mysqltest.cc mariadb-10.0.10/clie else die("Illegal option to connect: %.*s", (int) (end - con_options), con_options); -@@ -6011,8 +6014,11 @@ void do_connect(struct st_command *comma +@@ -6047,8 +6050,11 @@ void do_connect(struct st_command *comma if (con_ssl) { #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) diff --git a/mariadb.spec b/mariadb.spec index 0ea764a..6b87552 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -6,8 +6,8 @@ %bcond_with tokudb Name: mariadb -Version: 10.0.10 -Release: 3%{?dist} +Version: 10.0.11 +Release: 1%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -35,7 +35,7 @@ License: GPLv2 with exceptions and LGPLv2 and BSD %global mysqld_enabled_flag_file %{_localstatedir}/lib/rpm-state/mysqld_enabled %global mysqld_running_flag_file %{_localstatedir}/lib/rpm-state/mysqld_running -Source0: http://ftp.osuosl.org/pub/mariadb/mariadb-%{version}/kvm-tarbake-jaunty-x86/mariadb-%{version}.tar.gz +Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz Source3: my.cnf Source5: my_config.h Source6: README.mysql-docs @@ -807,6 +807,9 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Wed May 14 2014 Jakub Dorňák - 1:10.0.11-1 +- Rebase to version 10.0.11 + * Mon May 05 2014 Honza Horak - 1:10.0.10-3 - Script for socket check enhanced diff --git a/sources b/sources index aa0b46a..0d4957e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14ce22b8197d4eae88d237776d47220f mariadb-10.0.10.tar.gz +faa2ea3f9c6f7bc5f021d299367a7a8d mariadb-10.0.11.tar.gz