rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f24

Browse Source
This commit is contained in:
Jakub Dorňák 2016-09-08 08:49:44 +02:00
commit 685b728bed
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mariadb.spec
View File

@ -119,7 +119,7 @@
# Make long macros shorter # Make long macros shorter
%global sameevr %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
%global compatver 10.1 %global compatver 10.1
%global bugfixver 16 %global bugfixver 17
Name: mariadb Name: mariadb
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
@ -932,7 +932,7 @@ export MTR_BUILD_THREAD=%{__isa_bits}
set -e set -e
cd mysql-test cd mysql-test
perl ./mysql-test-run.pl --force --retry=0 --ssl \ perl ./mysql-test-run.pl --force --retry=0 --ssl \
--suite-timeout=720 --testcase-timeout=30 \ --suite-timeout=720 --testcase-timeout=30 --skip-rpl \
--mysqld=--binlog-format=mixed --force-restart \ --mysqld=--binlog-format=mixed --force-restart \
--shutdown-timeout=60 --max-test-fail=0 \ --shutdown-timeout=60 --max-test-fail=0 \
%if %{check_testsuite} %if %{check_testsuite}
@ -1299,6 +1299,13 @@ fi
%endif %endif
%changelog %changelog
* Wed Aug 31 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.17-1
- Update to 10.1.17
* Mon Aug 29 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.16-2
- Fixed galera replication
Resolves: #1352946
* Tue Jul 19 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.16-1 * Tue Jul 19 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.16-1
- Update to 10.1.16 - Update to 10.1.16
@ -1333,6 +1340,9 @@ fi
- Fix mysql-prepare-db-dir - Fix mysql-prepare-db-dir
Resolves: #1335849 Resolves: #1335849
* Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.2.0-1
- Update to 10.2.0
* Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.14-1 * Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.14-1
- Add selinux policy - Add selinux policy
- Update to 10.1.14 (includes various bug fixes) - Update to 10.1.14 (includes various bug fixes)

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

@ -10,3 +10,4 @@ main.userstat : rhbz#1096787
perfschema.nesting : rhbz#1096787 perfschema.nesting : rhbz#1096787
perfschema.socket_summary_by_event_name_func : rhbz#1096787 perfschema.socket_summary_by_event_name_func : rhbz#1096787
perfschema.socket_summary_by_instance_func : rhbz#1096787 perfschema.socket_summary_by_instance_func : rhbz#1096787
sys_vars.wsrep_provider_options_basic : rhbz#1096787

2
sources
View File

@ -1 +1 @@
2a26b8d6560693cfc51031e76522cb78 mariadb-10.1.16.tar.gz 036aca95257cb2948dd100605ec6d5a1 mariadb-10.1.17.tar.gz