diff --git a/mariadb.spec b/mariadb.spec index 91c20aa..65bbc9d 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -100,7 +100,7 @@ Name: %{pkgname} Version: %{compatver}.%{bugfixver} -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -1122,6 +1122,10 @@ fi %endif %changelog +* Mon Sep 08 2014 Honza Horak - 1:10.0.13-6 +- Disable vcol_supported_sql_funcs_myisam test on all arches + Related: #1096787 + * Thu Sep 04 2014 Honza Horak - 1:10.0.13-5 - Fix paths in mysql_install_db script Resolves: #1134328 diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list index aac4c87..635845c 100644 --- a/rh-skipped-tests-arm.list +++ b/rh-skipped-tests-arm.list @@ -11,6 +11,5 @@ connect.bin : rhbz#1096787 (pass on aarch64) main.gis-precise : rhbz#1096787 (pass on armv7hl) main.openssl_1 : rhbz#1096787 perfschema.setup_objects : rhbz#1096787 -vcol.vcol_supported_sql_funcs_myisam : rhbz#1096787 innodb.innodb_simulate_comp_failures_small : rhbz#1096787 main.key_cache : rhbz#1096787 diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 196fa1a..d144318 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -6,3 +6,4 @@ perfschema.nesting : rhbz#1096787 perfschema.socket_summary_by_event_name_func : rhbz#1096787 perfschema.socket_summary_by_instance_func : rhbz#1096787 vcol.vcol_supported_sql_funcs_innodb : rhbz#1096787 +vcol.vcol_supported_sql_funcs_myisam : rhbz#1096787 diff --git a/rh-skipped-tests-intel.list b/rh-skipped-tests-intel.list index 8065f23..1660a88 100644 --- a/rh-skipped-tests-intel.list +++ b/rh-skipped-tests-intel.list @@ -1,2 +1 @@ main.openssl_1 : rhbz#1096787 -vcol.vcol_supported_sql_funcs_myisam : rhbz#1096787 diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list index 8c15a79..45cc061 100644 --- a/rh-skipped-tests-ppc-s390.list +++ b/rh-skipped-tests-ppc-s390.list @@ -17,4 +17,3 @@ rpl.rpl_slave_skip : rhbz#1096787 rpl.rpl_stm_max_relay_size : rhbz#1096787 sys_vars.max_relay_log_size_basic : rhbz#1096787 sys_vars.sql_slave_skip_counter_basic : rhbz#1096787 -vcol.vcol_supported_sql_funcs_myisam : rhbz#1096787