diff --git a/community-mysql-5.7.13-fpu.patch b/community-mysql-5.7.13-fpu.patch new file mode 100644 index 0000000..4a26ada --- /dev/null +++ b/community-mysql-5.7.13-fpu.patch @@ -0,0 +1,113 @@ +commit 34ee5b9ce2d3ab1ccfb91016ee058949c69c1066 +Author: Norvald H. Ryeng +Date: Fri May 27 15:19:56 2016 +0200 + + Bug#23046775 DIFFERENT FLOATING POINT RESULTS ON ARM64 AND POWERPC + + Backport from trunk. + + Problem: The -fexpensive-optimizations option to gcc causes ARM64 and + PowerPC build to compute floating point operations slightly + differently from other platforms. This flag is enabled by -O2 and + higher optimization levels. + + Fix: Check for the unwanted floating point behavior in CMake and + disable expensive-optimizations in GCC builds on platforms that + experience this behavior. + +diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake +index 98d553a..f105c7a 100644 +--- a/cmake/build_configurations/compiler_options.cmake ++++ b/cmake/build_configurations/compiler_options.cmake +@@ -15,6 +15,7 @@ + + INCLUDE(CheckCCompilerFlag) + INCLUDE(CheckCXXCompilerFlag) ++INCLUDE(cmake/floating_point.cmake) + + IF(SIZEOF_VOIDP EQUAL 4) + SET(32BIT 1) +@@ -33,6 +34,10 @@ IF(UNIX) + IF(WITH_VALGRIND) + SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") + ENDIF() ++ # Disable optimizations that change floating point results ++ IF(HAVE_C_FLOATING_POINT_OPTIMIZATION_PROBLEMS) ++ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations") ++ ENDIF() + SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") + SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") + ENDIF() +@@ -48,6 +53,10 @@ IF(UNIX) + IF(WITH_VALGRIND) + SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") + ENDIF() ++ # Disable optimizations that change floating point results ++ IF(HAVE_CXX_FLOATING_POINT_OPTIMIZATION_PROBLEMS) ++ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations") ++ ENDIF() + SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") + ENDIF() +diff --git a/cmake/floating_point.cmake b/cmake/floating_point.cmake +new file mode 100644 +index 0000000..6db63ad +--- /dev/null ++++ b/cmake/floating_point.cmake +@@ -0,0 +1,56 @@ ++# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; version 2 of the License. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++INCLUDE(CheckCSourceRuns) ++INCLUDE(CheckCXXSourceRuns) ++ ++SET(code " ++ int main (int argc, char **argv) ++ { ++ double n[21] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1,1 }; ++ double m= 0, s= 0; ++ int i; ++ for(i= 0; i < 21; i++) ++ { ++ double m_kminusone= m; ++ m= m_kminusone + (n[i] - m_kminusone) / (double) (i + 2); ++ s= s + (n[i] - m_kminusone) * (n[i] - m); ++ } ++ /* ++ s should now be either 5e 74 d1 45 17 5d 14 40 or ++ 40 14 5d 17 45 d1 74 5e, depending on endianness. If the floating point ++ operations are over optimized, the least significant byte is 5d instead ++ of 5e. ++ */ ++ return (*(unsigned char*)(&s) == 0x5e || ++ *((unsigned char*)(&s) + 7) == 0x5e); ++ }" ++) ++ ++SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") ++SET(CMAKE_REQUIRED_FLAGS ++ "${CMAKE_REQUIRED_FLAGS} -O3 -fexpensive-optimizations" ++) ++ ++IF(CMAKE_COMPILER_IS_GNUCC) ++ CHECK_C_SOURCE_RUNS("${code}" HAVE_C_FLOATING_POINT_OPTIMIZATION_PROBLEMS) ++ENDIF() ++ ++IF(CMAKE_COMPILER_IS_GNUCXX) ++ CHECK_CXX_SOURCE_RUNS("${code}" HAVE_CXX_FLOATING_POINT_OPTIMIZATION_PROBLEMS) ++ENDIF() ++ ++SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}") diff --git a/community-mysql-5.7.13-gcc6.patch b/community-mysql-5.7.13-gcc6.patch new file mode 100644 index 0000000..d971ddd --- /dev/null +++ b/community-mysql-5.7.13-gcc6.patch @@ -0,0 +1,14 @@ +diff --git a/client/auth_utils.cc b/client/auth_utils.cc +index 21416bb..03fd71c 100644 +--- a/client/auth_utils.cc ++++ b/client/auth_utils.cc +@@ -61,7 +61,7 @@ int parse_cnf_file(istream &sin, map *options, + getline(sin, option_value); + trim(&option_value); + if (option_name.length() > 0) +- options->insert(make_pair(option_name, option_value)); ++ options->insert(make_pair(option_name, option_value)); + } + return ALL_OK; + } catch(...) + diff --git a/community-mysql-5.7.13-libedit.patch b/community-mysql-5.7.13-libedit.patch new file mode 100644 index 0000000..0bcd7e8 --- /dev/null +++ b/community-mysql-5.7.13-libedit.patch @@ -0,0 +1,113 @@ +From 41480c0bacf8f354610825856b5c66b8516da607 Mon Sep 17 00:00:00 2001 +From: Jon Olav Hauglid +Date: Fri, 1 Jul 2016 09:00:16 +0200 +Subject: [PATCH] Bug#23708332: -DWITH_EDITLINE=SYSTEM BREAKS WITH + LIBEDIT-20160618-3.1 + +Add CMake check for the new editline completion API +and based on the result, use already existing code +for it in the mysql client. + +Change-Id: I8a9a721de24eef6359d3285cffd9745a8894ea4b +--- + client/mysql.cc | 8 ++++---- + cmake/readline.cmake | 22 +++++++++++++++++++--- + config.h.cmake | 1 + + 3 files changed, 24 insertions(+), 7 deletions(-) + +diff --git a/client/mysql.cc b/client/mysql.cc +index 94c3227..46147e9 100644 +--- a/client/mysql.cc ++++ b/client/mysql.cc +@@ -2816,7 +2816,7 @@ C_MODE_END + if not. + */ + +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_EDITLINE_INTERFACE) + static int fake_magic_space(int, int); + extern "C" char *no_completion(const char*,int) + #elif defined(USE_LIBEDIT_INTERFACE) +@@ -2845,7 +2845,7 @@ static int not_in_history(const char *line) + } + + +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_EDITLINE_INTERFACE) + static int fake_magic_space(int, int) + #else + static int fake_magic_space(const char *, int) +@@ -2862,7 +2862,7 @@ static void initialize_readline (char *name) + rl_readline_name = name; + + /* Tell the completer that we want a crack first. */ +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_EDITLINE_INTERFACE) + rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; + rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; + +@@ -2890,7 +2890,7 @@ static char **new_mysql_completion(const char *text, + int end MY_ATTRIBUTE((unused))) + { + if (!status.batch && !quick) +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_EDITLINE_INTERFACE) + return rl_completion_matches(text, new_command_generator); + #else + return completion_matches((char *)text, (CPFunction *)new_command_generator); +diff --git a/cmake/readline.cmake b/cmake/readline.cmake +index 00ecc53..8aed8cb 100644 +--- a/cmake/readline.cmake ++++ b/cmake/readline.cmake +@@ -1,4 +1,4 @@ +-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -158,12 +158,28 @@ MACRO (FIND_SYSTEM_EDITLINE) + completion_matches(0,0); + return res; + }" +- EDITLINE_HAVE_COMPLETION) ++ EDITLINE_HAVE_COMPLETION_INT) + +- IF(EDITLINE_HAVE_COMPLETION) ++ CHECK_CXX_SOURCE_COMPILES(" ++ #include ++ #include ++ int main(int argc, char **argv) ++ { ++ typedef char* MYFunction(const char*, int); ++ MYFunction* myf= rl_completion_entry_function; ++ char *res= (myf)(NULL, 0); ++ completion_matches(0,0); ++ return res != NULL; ++ }" ++ EDITLINE_HAVE_COMPLETION_CHAR) ++ ++ IF(EDITLINE_HAVE_COMPLETION_INT OR EDITLINE_HAVE_COMPLETION_CHAR) + SET(HAVE_HIST_ENTRY ${EDITLINE_HAVE_HIST_ENTRY}) + SET(USE_LIBEDIT_INTERFACE 1) + SET(EDITLINE_FOUND 1) ++ IF(EDITLINE_HAVE_COMPLETION_CHAR) ++ SET(USE_NEW_EDITLINE_INTERFACE 1) ++ ENDIF() + ENDIF() + ENDIF() + ENDMACRO() +diff --git a/config.h.cmake b/config.h.cmake +index f0a11c4..388442c 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -276,6 +276,7 @@ + #cmakedefine HAVE_NCURSES_H 1 + #cmakedefine USE_LIBEDIT_INTERFACE 1 + #cmakedefine HAVE_HIST_ENTRY 1 ++#cmakedefine USE_NEW_EDITLINE_INTERFACE 1 + + /* + * Libedit +-- +2.7.4 + diff --git a/community-mysql-5.7.13-pfs-oom-unittest.patch b/community-mysql-5.7.13-pfs-oom-unittest.patch new file mode 100644 index 0000000..893b70f --- /dev/null +++ b/community-mysql-5.7.13-pfs-oom-unittest.patch @@ -0,0 +1,51 @@ +commit 6c23035b52284c2575f297311dfd0278bcbb0dd1 +Author: Christopher Powers +Date: Mon May 2 19:43:31 2016 +0100 + + Bug#23186653 PERFORMANCE SCHEMA UNIT TESTS PFS_INSTR-OOM & PFS_INSTR_CLASS FAIL REGULARLY + + Two test cases pass on Windows but crash on Linux due to different init paths. + Now pass on both. + +diff --git a/storage/perfschema/unittest/pfs_instr-oom-t.cc b/storage/perfschema/unittest/pfs_instr-oom-t.cc +index db74c9c..b6bc818 100644 +--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc ++++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc +@@ -232,12 +232,14 @@ void test_oom() + ok(cond_2 == NULL, "oom (create cond)"); + + /* Create file. */ +- stub_alloc_always_fails = false; + PFS_thread fake_thread; ++ rc = init_instruments(¶m); + fake_thread.m_filename_hash_pins= NULL; + init_file_hash(¶m); +- rc = init_instruments(¶m); +- ok(rc == 0, "instances init"); ++ ++ stub_alloc_always_fails = true; ++ file_2 = find_or_create_file(&fake_thread, &dummy_file_class, "dummy", 5, true); ++ ok(file_2 == NULL, "oom (create file)"); + + stub_alloc_always_fails= false; + file_1= find_or_create_file(&fake_thread, &dummy_file_class, "dummy", 5, true); +@@ -245,10 +247,6 @@ void test_oom() + release_file(file_1); + cleanup_instruments(); + +- stub_alloc_always_fails= true; +- file_2= find_or_create_file(&fake_thread, &dummy_file_class, "dummy", 5, true); +- ok(file_2 == NULL, "oom (create file)"); +- + /* Create socket. */ + stub_alloc_always_fails = false; + rc = init_instruments(¶m); +@@ -422,7 +420,7 @@ void do_all_tests() + + int main(int, char **) + { +- plan(28); ++ plan(32); + MY_INIT("pfs_instr-oom-t"); + do_all_tests(); + return 0; diff --git a/community-mysql-5.7.9-major.patch b/community-mysql-5.7.9-major.patch index bd50dc4..72f5bd6 100644 --- a/community-mysql-5.7.9-major.patch +++ b/community-mysql-5.7.9-major.patch @@ -6,6 +6,6 @@ -SET(SHARED_LIB_MAJOR_VERSION "20") +SET(SHARED_LIB_MAJOR_VERSION "1020") - SET(SHARED_LIB_MINOR_VERSION "2") + SET(SHARED_LIB_MINOR_VERSION "3") SET(PROTOCOL_VERSION "10") SET(DOT_FRM_VERSION "6") diff --git a/community-mysql.spec b/community-mysql.spec index f05a125..1a3af42 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -79,8 +79,8 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: community-mysql -Version: 5.7.12 -Release: 2%{?with_debug:.debug}%{?dist} +Version: 5.7.13 +Release: 1%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -120,6 +120,10 @@ Patch6: %{pkgnamepatch}-paths.patch # Patches specific for this mysql package Patch51: %{pkgnamepatch}-chain-certs.patch Patch52: %{pkgnamepatch}-sharedir.patch +Patch53: %{pkgnamepatch}-5.7.13-pfs-oom-unittest.patch +Patch54: %{pkgnamepatch}-5.7.13-fpu.patch +Patch55: %{pkgnamepatch}-5.7.13-gcc6.patch +Patch56: %{pkgnamepatch}-5.7.13-libedit.patch Patch70: %{pkgnamepatch}-5.7.9-major.patch # Patches taken from boost 1.59 @@ -377,6 +381,10 @@ the MySQL sources. %patch6 -p1 %patch51 -p1 %patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 %if %{with_shared_lib_major_hack} %patch70 -p1 %endif @@ -396,160 +404,60 @@ popd pushd mysql-test add_test () { - echo $1 >> %{skiplist} + echo "$@" $ >> %{skiplist} } touch %{skiplist} -# these tests fail in 5.7.10 on arms -%ifarch aarch64 armv7hl -add_test 'binlog.binlog_xa_prepared_disconnect : fails in 5.7.10' -add_test 'gis.geometry_class_attri_prop : fails in 5.7.10' -add_test 'gis.geometry_property_function_issimple : fails in 5.7.10' -add_test 'gis.gis_bugs_crashes : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_buffer : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_centroid : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_distance : fails in 5.7.10' -add_test 'gis.spatial_operators_intersection : fails in 5.7.10' -add_test 'gis.spatial_operators_union : fails in 5.7.10' -add_test 'gis.spatial_op_testingfunc_mix : fails in 5.7.10' -add_test 'gis.spatial_testing_functions_contains : fails in 5.7.10' -add_test 'gis.spatial_testing_functions_crosses : fails in 5.7.10' -add_test 'gis.spatial_testing_functions_equals : fails in 5.7.10' -add_test 'gis.spatial_testing_functions_touches : fails in 5.7.10' -add_test 'gis.spatial_testing_functions_within : fails in 5.7.10' -add_test 'gis.spatial_utility_function_simplify : fails in 5.7.10' -add_test 'innodb_fts.opt : fails in 5.7.10' -add_test 'innodb_gis.gis : fails in 5.7.10' -add_test 'innodb_gis.1 : fails in 5.7.10' -add_test 'innodb.innodb : fails in 5.7.10' -add_test 'innodb.innodb-wl5980-discard : fails in 5.7.10' -add_test 'innodb.log_file : fails in 5.7.10' -add_test 'main.ctype_big5 : fails in 5.7.10' -add_test 'main.ctype_gbk : fails in 5.7.10' -add_test 'main.gis : fails in 5.7.10' -add_test 'main.gis-precise : fails in 5.7.10' -add_test 'main.insert : fails in 5.7.10' -add_test 'perfschema.func_file_io : fails in 5.7.10' -add_test 'perfschema.merge_table_io : fails in 5.7.10' -add_test 'perfschema.setup_objects : fails in 5.7.10' -add_test 'sysschema.fn_ps_thread_trx_info : fails in 5.7.10' -add_test 'sysschema.v_schema_auto_increment_columns : fails in 5.7.10' -add_test 'test_service_sql_api.test_session_detach : fails in 5.7.10' -add_test 'test_service_sql_api.test_session_info : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_all_col_types : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_complex : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_errors : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_general_log : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_processlist : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_replication : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_sqlmode : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_stored_procedures_functions: fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_views_triggers : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_2_sessions : fails in 5.7.10' +# unstable on all archs +add_test binlog.binlog_xa_prepared_disconnect : unstable test +add_test innodb.table_encrypt_kill : unstable test + +# these tests fail in 5.7.13 on arm32 +%ifarch %arm +# GIS related issue +add_test innodb_gis.1 : arm32 gis issue +add_test innodb_gis.gis : arm32 gis issue +add_test main.gis-precise : arm32 gis issue +add_test main.gis : arm32 gis issue +add_test gis.gis_bugs_crashes : arm32 gis issue +add_test gis.spatial_operators_intersection : arm32 gis issue +add_test gis.spatial_operators_union : arm32 gis issue +add_test gis.spatial_testing_functions_contains : arm32 gis issue +add_test gis.spatial_testing_functions_crosses : arm32 gis issue +add_test gis.spatial_testing_functions_equals : arm32 gis issue +add_test gis.spatial_testing_functions_touches : arm32 gis issue +add_test gis.spatial_testing_functions_within : arm32 gis issue +# FTS +add_test innodb_fts.opt : arm32 FTS issue +# Missing hw counters +add_test perfschema.func_file_io : missing hw on arm32 +add_test perfschema.setup_objects : missing hw on arm32 %endif -# these tests fail in 5.7.10 on ppcs -%ifarch ppc64 ppc64le -add_test 'federated.federated_server : fails in 5.7.10' -add_test 'funcs_1.innodb_views : fails in 5.7.10' -add_test 'funcs_1.storedproc : fails in 5.7.10' -add_test 'gis.geometry_class_attri_prop : fails in 5.7.10' -add_test 'gis.geometry_property_function_issimple : fails in 5.7.10' -add_test 'gis.gis_bugs_crashes : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_buffer : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_centroid : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_distance : fails in 5.7.10' -add_test 'gis.spatial_operators_symdifference : fails in 5.7.10' -add_test 'gis.spatial_operators_union : fails in 5.7.10' -add_test 'gis.spatial_op_testingfunc_mix : fails in 5.7.10' -add_test 'gis.spatial_utility_function_distance_sphere : fails in 5.7.10' -add_test 'gis.spatial_utility_function_simplify : fails in 5.7.10' -add_test 'innodb_fts.ngram_1 : fails in 5.7.10' -add_test 'innodb_fts.plugin : fails in 5.7.10' -add_test 'innodb_fts.tablespace_location : fails in 5.7.10' -add_test 'innodb.innodb_bug30919 : fails in 5.7.10' -add_test 'innodb.innodb : fails in 5.7.10' -add_test 'innodb.mysqldump_max_recordsize : fails in 5.7.10' -add_test 'innodb_zip.cmp_per_index : fails in 5.7.10' -add_test 'innodb_zip.wl6470_2 : fails in 5.7.10' -add_test 'main.bootstrap : fails in 5.7.10' -add_test 'main.ctype_big5 : fails in 5.7.10' -add_test 'main.ctype_cp1251 : fails in 5.7.10' -add_test 'main.ctype_gbk : fails in 5.7.10' -add_test 'main.grant_alter_user : fails in 5.7.10' -add_test 'main.innodb_icp : fails in 5.7.10' -add_test 'main.innodb_mrr : fails in 5.7.10' -add_test 'main.innodb_mrr_icp : fails in 5.7.10' -add_test 'main.insert : fails in 5.7.10' -add_test 'main.mysql_client_test : fails in 5.7.10' -add_test 'main.mysqldump : fails in 5.7.10' -add_test 'main.mysql_embedded : fails in 5.7.10' -add_test 'main.partition_innodb_semi_consistent : fails in 5.7.10' -add_test 'main.partition_range : fails in 5.7.10' -add_test 'main.sql_mode_default : fails in 5.7.10' -add_test 'main.subquery_sj_dupsweed_bka_nixbnl : fails in 5.7.10' -add_test 'main.subquery_sj_firstmatch_bka : fails in 5.7.10' -add_test 'main.subquery_sj_firstmatch_bka_nixbnl : fails in 5.7.10' -add_test 'main.subquery_sj_none_bka : fails in 5.7.10' -add_test 'main.subselect_innodb : fails in 5.7.10' -add_test 'perfschema.mdl_func : fails in 5.7.10' -add_test 'perfschema.socket_summary_by_instance_func : fails in 5.7.10' -add_test 'rpl.rpl_alter_repository : fails in 5.7.10' -add_test 'rpl.rpl_checksum_cache : fails in 5.7.10' -add_test 'rpl.rpl_innodb_bug28430 : fails in 5.7.10' -add_test 'rpl.rpl_innodb_bug30888 : fails in 5.7.10' -add_test 'rpl.rpl_many_optimize : fails in 5.7.10' -add_test 'rpl.rpl_mixed_binlog_max_cache_size : fails in 5.7.10' -add_test 'rpl.rpl_recovery_replicate_same_server_id : fails in 5.7.10' -add_test 'rpl.rpl_replicate_do : fails in 5.7.10' -add_test 'rpl.rpl_rotate_logs : fails in 5.7.10' -add_test 'sysschema.pr_diagnostics : fails in 5.7.10' -add_test 'sysschema.pr_statement_performance_analyzer : fails in 5.7.10' -add_test 'sysschema.v_schema_auto_increment_columns : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_views_triggers : fails in 5.7.10' -%endif - -# these tests fail in 5.7.10 on s390s -%ifarch s390 s390x -add_test 'gis.geometry_class_attri_prop : fails in 5.7.10' -add_test 'gis.gis_bugs_crashes : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_buffer : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_centroid : fails in 5.7.10' -add_test 'gis.spatial_analysis_functions_distance : fails in 5.7.10' -add_test 'gis.spatial_operators_symdifference : fails in 5.7.10' -add_test 'gis.spatial_operators_union : fails in 5.7.10' -add_test 'gis.spatial_op_testingfunc_mix : fails in 5.7.10' -add_test 'gis.spatial_utility_function_distance_sphere : fails in 5.7.10' -add_test 'gis.spatial_utility_function_simplify : fails in 5.7.10' -add_test 'innodb_fts.opt : fails in 5.7.10' -add_test 'main.ps_ddl : fails in 5.7.10' -add_test 'main.ps_ddl1 : fails in 5.7.10' -add_test 'perfschema.status_reprepare : fails in 5.7.10' -add_test 'rpl.rpl_cross_version : fails in 5.7.10' -add_test 'rpl.rpl_dual_pos_advance : fails in 5.7.10' -add_test 'test_service_sql_api.test_session_detach : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_all_col_types : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_complex : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_replication : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_sqlmode : fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_stored_procedures_functions: fails in 5.7.10' -add_test 'test_service_sql_api.test_sql_views_triggers : fails in 5.7.10' +# these tests fail in 5.7.13 on aarch64 +%ifarch aarch64 +add_test innodb.innodb : missing correct value +add_test innodb_fts.large_records : innodb assert +add_test main.ctype_big5 : innodb assert +add_test main.ctype_gbk : innodb assert +add_test main.ctype_utf8mb4_uca : innodb assert +add_test main.insert : innodb assert +add_test main.sp_trans : innodb assert +add_test sysschema.pr_diagnostics : innodb assert +add_test sys_vars.log_slow_admin_statements_func : innodb assert %endif -# Workaround for upstream bug #http://bugs.mysql.com/56342 -rm -f t/ssl_8k_key-master.opt - -# Archs without hw performance counter, rh 741325 -%ifarch aarch64 sparc64 -add_test 'perfschema.func_file_io : rh 741325' -add_test 'perfschema.setup_objects : rh 741325' -%endif - -# Archs with ps_ddl issues -%ifarch s390 -add_test 'main.ps_ddl : ps_ddl issue' -add_test 'main.ps_ddl1 : ps_ddl issue' +# these tests fail in 5.7.13 on ppc64* +%ifarch ppc64 ppc64le +add_test innodb.innodb : missing correct value +add_test main.ctype_big5 : innodb assert +add_test main.ctype_gbk : innodb assert +add_test main.insert : innodb assert +add_test main.innodb_mrr_cost_icp : innodb assert +add_test main.mysqldump : innodb assert +add_test sys_vars.log_slow_admin_statements_func : innodb assert +add_test parts.partition_int_innodb : parts issue %endif popd @@ -617,7 +525,7 @@ cmake .. \ -DWITH_ZLIB=system \ -DWITH_BOOST=../boost/boost_1_59_0 \ -DCMAKE_C_FLAGS="%{optflags}%{?with_debug: -fno-strict-overflow -Wno-unused-result -Wno-unused-function -Wno-unused-but-set-variable}" \ - -DCMAKE_CXX_FLAGS="-std=gnu++98 %{optflags}%{?with_debug: -fno-strict-overflow -Wno-unused-result -Wno-unused-function -Wno-unused-but-set-variable}" \ + -DCMAKE_CXX_FLAGS="%{optflags}%{?with_debug: -fno-strict-overflow -Wno-unused-result -Wno-unused-function -Wno-unused-but-set-variable}" \ %{?with_debug: -DWITH_DEBUG=1}\ -DTMPDIR=/var/tmp \ %{?_hardened_build:-DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"}