rpms/mariadb10.11
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase to version 10.0.11

Browse Source
This commit is contained in:
Jakub Dorňák 2014-05-14 14:05:26 +02:00
parent f2056aa950
commit d6a8f7fcc4
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/mariadb-5.5.35.tar.gz /mariadb-5.5.35.tar.gz
/mariadb-5.5.36.tar.gz /mariadb-5.5.36.tar.gz
/mariadb-10.0.10.tar.gz /mariadb-10.0.10.tar.gz
/mariadb-10.0.11.tar.gz

12
mariadb-cipherspec.patch
View File

@ -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. and tests are adjusted to specify the expected cipher explicitly.
Upstream bug report: http://bugs.mysql.com/bug.php?id=64461 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 diff -up --recursive mariadb-10.0.11.p6/client/mysqltest.cc mariadb-10.0.11/client/mysqltest.cc
--- mariadb-10.0.10.p6/client/mysqltest.cc 2014-03-30 19:56:39.000000000 +0200 --- mariadb-10.0.11.p6/client/mysqltest.cc 2014-05-14 13:48:57.021925254 +0200
+++ mariadb-10.0.10/client/mysqltest.cc 2014-04-07 17:21:33.840148449 +0200 +++ mariadb-10.0.11/client/mysqltest.cc 2014-05-14 13:55:20.192711847 +0200
@@ -5872,6 +5872,7 @@ void do_connect(struct st_command *comma @@ -5908,6 +5908,7 @@ void do_connect(struct st_command *comma
my_bool con_pipe= 0; my_bool con_pipe= 0;
my_bool con_shm __attribute__ ((unused))= 0; my_bool con_shm __attribute__ ((unused))= 0;
struct st_connection* con_slot; 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_connection_name;
static DYNAMIC_STRING ds_host; 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; con_pipe= 1;
else if (length == 3 && !strncmp(con_options, "SHM", 3)) else if (length == 3 && !strncmp(con_options, "SHM", 3))
con_shm= 1; con_shm= 1;
@ -24,7 +24,7 @@ diff -up --recursive mariadb-10.0.10.p6/client/mysqltest.cc mariadb-10.0.10/clie
else else
die("Illegal option to connect: %.*s", die("Illegal option to connect: %.*s",
(int) (end - con_options), con_options); (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 (con_ssl)
{ {
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)

9
mariadb.spec
View File

@ -6,8 +6,8 @@
%bcond_with tokudb %bcond_with tokudb
Name: mariadb Name: mariadb
Version: 10.0.10 Version: 10.0.11
Release: 3%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
Summary: A community developed branch of MySQL 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_enabled_flag_file %{_localstatedir}/lib/rpm-state/mysqld_enabled
%global mysqld_running_flag_file %{_localstatedir}/lib/rpm-state/mysqld_running %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 Source3: my.cnf
Source5: my_config.h Source5: my_config.h
Source6: README.mysql-docs Source6: README.mysql-docs
@ -807,6 +807,9 @@ fi
%{_mandir}/man1/mysql_client_test.1* %{_mandir}/man1/mysql_client_test.1*
%changelog %changelog
* Wed May 14 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.11-1
- Rebase to version 10.0.11
* Mon May 05 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.10-3 * Mon May 05 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.10-3
- Script for socket check enhanced - Script for socket check enhanced

2
sources
View File

@ -1 +1 @@
14ce22b8197d4eae88d237776d47220f mariadb-10.0.10.tar.gz faa2ea3f9c6f7bc5f021d299367a7a8d mariadb-10.0.11.tar.gz