rpms/mariadb10.11
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to version 10.0.12

Browse Source
This commit is contained in:
Jakub Dorňák 2014-06-19 16:08:41 +02:00
parent eeaa2f723c
commit 3a5d7cd0bc
7 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/mariadb-5.5.36.tar.gz
/mariadb-10.0.10.tar.gz
/mariadb-10.0.11.tar.gz
/mariadb-10.0.12.tar.gz

36
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.
Upstream bug report: http://bugs.mysql.com/bug.php?id=64461
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
diff -up --recursive mariadb-10.0.12.orig/client/mysqltest.cc mariadb-10.0.12/client/mysqltest.cc
--- mariadb-10.0.12.orig/client/mysqltest.cc 2014-06-12 11:26:05.000000000 +0200
+++ mariadb-10.0.12/client/mysqltest.cc 2014-06-18 11:24:49.623171255 +0200
@@ -5912,6 +5912,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.11.p6/client/mysqltest.cc mariadb-10.0.11/clie
static DYNAMIC_STRING ds_connection_name;
static DYNAMIC_STRING ds_host;
@@ -5998,6 +5999,8 @@ void do_connect(struct st_command *comma
@@ -6002,6 +6003,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.11.p6/client/mysqltest.cc mariadb-10.0.11/clie
else
die("Illegal option to connect: %.*s",
(int) (end - con_options), con_options);
@@ -6047,8 +6050,11 @@ void do_connect(struct st_command *comma
@@ -6051,8 +6054,11 @@ void do_connect(struct st_command *comma
if (con_ssl)
{
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
@ -37,9 +37,9 @@ diff -up --recursive mariadb-10.0.11.p6/client/mysqltest.cc mariadb-10.0.11/clie
mysql_options(con_slot->mysql, MYSQL_OPT_SSL_CRL, opt_ssl_crl);
mysql_options(con_slot->mysql, MYSQL_OPT_SSL_CRLPATH, opt_ssl_crlpath);
#if MYSQL_VERSION_ID >= 50000
diff -up --recursive mariadb-10.0.10.p6/mysql-test/t/openssl_1.test mariadb-10.0.10/mysql-test/t/openssl_1.test
--- mariadb-10.0.10.p6/mysql-test/t/openssl_1.test 2014-03-30 19:56:53.000000000 +0200
+++ mariadb-10.0.10/mysql-test/t/openssl_1.test 2014-04-07 17:58:49.924934666 +0200
diff -up --recursive mariadb-10.0.12.orig/mysql-test/t/openssl_1.test mariadb-10.0.12/mysql-test/t/openssl_1.test
--- mariadb-10.0.12.orig/mysql-test/t/openssl_1.test 2014-06-12 11:26:05.000000000 +0200
+++ mariadb-10.0.12/mysql-test/t/openssl_1.test 2014-06-18 11:24:49.624171253 +0200
@@ -20,13 +20,13 @@ grant select on test.* to ssl_user4@loca
grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
flush privileges;
@ -77,9 +77,9 @@ diff -up --recursive mariadb-10.0.10.p6/mysql-test/t/openssl_1.test mariadb-10.0
SHOW STATUS LIKE 'Ssl_cipher';
disconnect con1;
connection default;
diff -up --recursive mariadb-10.0.10.p6/mysql-test/t/ssl_compress.test mariadb-10.0.10/mysql-test/t/ssl_compress.test
--- mariadb-10.0.10.p6/mysql-test/t/ssl_compress.test 2014-03-30 19:56:35.000000000 +0200
+++ mariadb-10.0.10/mysql-test/t/ssl_compress.test 2014-04-07 18:00:39.199845919 +0200
diff -up --recursive mariadb-10.0.12.orig/mysql-test/t/ssl_compress.test mariadb-10.0.12/mysql-test/t/ssl_compress.test
--- mariadb-10.0.12.orig/mysql-test/t/ssl_compress.test 2014-06-12 11:26:07.000000000 +0200
+++ mariadb-10.0.12/mysql-test/t/ssl_compress.test 2014-06-18 11:24:49.624171253 +0200
@@ -8,7 +8,7 @@
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
@ -89,9 +89,9 @@ diff -up --recursive mariadb-10.0.10.p6/mysql-test/t/ssl_compress.test mariadb-1
# Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher';
diff -up --recursive mariadb-10.0.10.p6/mysql-test/t/ssl.test mariadb-10.0.10/mysql-test/t/ssl.test
--- mariadb-10.0.10.p6/mysql-test/t/ssl.test 2014-03-30 19:56:36.000000000 +0200
+++ mariadb-10.0.10/mysql-test/t/ssl.test 2014-04-07 18:01:14.270854601 +0200
diff -up --recursive mariadb-10.0.12.orig/mysql-test/t/ssl.test mariadb-10.0.12/mysql-test/t/ssl.test
--- mariadb-10.0.12.orig/mysql-test/t/ssl.test 2014-06-12 11:26:05.000000000 +0200
+++ mariadb-10.0.12/mysql-test/t/ssl.test 2014-06-18 11:24:49.624171253 +0200
@@ -8,7 +8,7 @@
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
@ -101,9 +101,9 @@ diff -up --recursive mariadb-10.0.10.p6/mysql-test/t/ssl.test mariadb-10.0.10/my
# Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher';
diff -up --recursive mariadb-10.0.10.p6/mysql-test/t/ssl_8k_key.test mariadb-10.0.10/mysql-test/t/ssl_8k_key.test
--- mariadb-10.0.10.p6/mysql-test/t/ssl_8k_key.test 2014-03-30 19:56:36.000000000 +0200
+++ mariadb-10.0.10/mysql-test/t/ssl_8k_key.test 2014-04-07 17:59:31.586757044 +0200
diff -up --recursive mariadb-10.0.12.orig/mysql-test/t/ssl_8k_key.test mariadb-10.0.12/mysql-test/t/ssl_8k_key.test
--- mariadb-10.0.12.orig/mysql-test/t/ssl_8k_key.test 2014-06-12 11:26:05.000000000 +0200
+++ mariadb-10.0.12/mysql-test/t/ssl_8k_key.test 2014-06-18 11:24:49.624171253 +0200
@@ -5,7 +5,7 @@
#
# Bug#29784 YaSSL assertion failure when reading 8k key.

27
mariadb-mysql_config.patch Normal file
View File

@ -0,0 +1,27 @@
--- mariadb-10.0.12/scripts/mysql_config.sh.orig 2014-06-17 11:11:54.444874750 +0200
+++ mariadb-10.0.12/scripts/mysql_config.sh 2014-06-17 11:30:48.244454413 +0200
@@ -176,10 +176,9 @@ Options:
pkglibdir [$pkglibdir]
plugindir [$plugindir]
EOF
- exit 0
}
-if test $# -le 0; then usage; fi
+if test $# -le 0; then usage; exit 0; fi
while test $# -gt 0; do
case $1 in
@@ -198,10 +197,10 @@ while test $# -gt 0; do
pkgincludedir) echo "$pkgincludedir" ;;
pkglibdir) echo "$pkglibdir" ;;
plugindir) echo "$plugindir" ;;
- *) usage ;;
+ *) echo >&2 "Unknown var: $var"; usage >&2; exit 1 ;;
esac
;;
- *) usage ;;
+ *) echo >&2 "Unknown option: $1"; usage >&2; exit 1 ;;
esac
shift

11
mariadb-skip-test-list.patch
View File

@ -1,11 +0,0 @@
--- mariadb-10.0.11/mysql-test/lib/mtr_cases.pm.orig 2014-05-29 09:38:59.828057468 +0200
+++ mariadb-10.0.11/mysql-test/lib/mtr_cases.pm 2014-05-29 09:39:26.890028880 +0200
@@ -321,7 +321,7 @@ sub parse_disabled {
chomp;
next if /^\s*#/ or /^\s*$/;
mtr_error("Syntax error in $filename line $.")
- unless /^\s*(?:([-0-9A-Za-z_]+)\.)?([-0-9A-Za-z_]+)\s*:\s*(.*?)\s*$/;
+ unless /^\s*(?:([-0-9A-Za-z_\/]+)\.)?([-0-9A-Za-z_]+)\s*:\s*(.*?)\s*$/;
mtr_error("Wrong suite name in $filename line $.")
if defined $1 and defined $suitename and $1 ne $suitename;
$disabled{($1 || $suitename || '') . ".$2"} = $3;

18
mariadb.spec
View File

@ -6,8 +6,8 @@
%bcond_with tokudb
Name: mariadb
Version: 10.0.11
Release: 5%{?dist}
Version: 10.0.12
Release: 1%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@ -71,7 +71,7 @@ Patch11: mariadb-covscan-signexpr.patch
Patch12: mariadb-covscan-stroverflow.patch
Patch13: mariadb-config.patch
Patch14: mariadb-ssltest.patch
Patch15: mariadb-skip-test-list.patch
Patch15: mariadb-mysql_config.patch
BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@ -490,9 +490,6 @@ install -p -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}%{_libexecdir}/
mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
# Fix funny permissions that cmake build scripts apply to config files
chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/config.*.ini
# Fix scripts for multilib safety
mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config
touch ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
@ -653,8 +650,6 @@ fi
%{_mandir}/man1/mysqlshow.1*
%{_mandir}/man1/mysqlslap.1*
%{_mandir}/man1/my_print_defaults.1*
%{_mandir}/man1/mysql_fix_privilege_tables.1*
%{_mandir}/man8/mysqlmanager.8*
%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
%config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf
@ -758,7 +753,6 @@ fi
%{_mandir}/man1/mysqld_safe.1*
%{_mandir}/man1/mysqlhotcopy.1*
%{_mandir}/man1/mysqlimport.1*
%{_mandir}/man1/mysqlman.1*
%{_mandir}/man1/mysql_setpermission.1*
%{_mandir}/man1/mysqltest.1*
%{_mandir}/man1/innochecksum.1*
@ -777,7 +771,6 @@ fi
%{_datadir}/%{name}/mysql_test_data_timezone.sql
%{_datadir}/%{name}/mysql_performance_tables.sql
%{_datadir}/%{name}/my-*.cnf
%{_datadir}/%{name}/config.*.ini
%{_unitdir}/mysqld.service
%{_unitdir}/%{name}.service
@ -792,7 +785,7 @@ fi
%attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql
%attr(0750,mysql,mysql) %dir %{_localstatedir}/log/%{name}
%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{_localstatedir}/log/%{name}/%{name}.log
%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{_localstatedir}/log/mysqld.log
%config %ghost %verify(not md5 size mtime) %{_localstatedir}/log/mysqld.log
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%files devel
@ -827,6 +820,9 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
* Tue Jun 17 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.12-1
- Rebase to version 10.0.12
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

5
rh-skipped-tests-base.list
View File

@ -17,6 +17,7 @@ funcs_1.innodb_views : rhbz#1096787
funcs_1.is_columns_innodb : rhbz#1096787
funcs_2.innodb_charset : rhbz#1096787
handler.innodb : rhbz#1096787
innodb.innodb : rhbz#1096787
innodb_fts.fulltext_order_by : rhbz#1096787
innodb_fts.fulltext2 : rhbz#1096787
innodb_fts.innodb-fts-ddl : rhbz#1096787
@ -57,6 +58,7 @@ main.ctype_utf8mb4 : rhbz#1096787
main.ctype_utf8mb4_innodb : rhbz#1096787
main.flush-innodb : rhbz#1096787
main.func_str : rhbz#1096787
main.gis-precise : rhbz#1096787
main.group_min_max_innodb : rhbz#1096787
main.implicit_commit : rhbz#1096787
main.index_intersect_innodb : rhbz#1096787
@ -68,10 +70,13 @@ main.innodb_mysql_lock : rhbz#1096787
main.innodb_mysql_lock2 : rhbz#1096787
main.multi_update : rhbz#1096787
main.mysqlcheck : rhbz#1096787
main.openssl_1 : rhbz#1096787
main.partition_exchange : rhbz#1096787
main.partition_innodb : rhbz#1096787
main.partition_innodb_plugin : rhbz#1096787
main.progress_976225 : rhbz#1096787
main.range : rhbz#1096787
main.range_mrr_icp : rhbz#1096787
main.range_vs_index_merge_innodb : rhbz#1096787
main.selectivity_innodb : rhbz#1096787
main.sp_trans : rhbz#1096787

2
sources
View File

@ -1 +1 @@
faa2ea3f9c6f7bc5f021d299367a7a8d mariadb-10.0.11.tar.gz
6e9a7c075526f8f2f83ad8e0933bab2f mariadb-10.0.12.tar.gz