!24 Fix Test Error
From: @baizg1107 Reviewed-by: @zhuchunyi Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot
Gitee
commit
430c907fb6
11
boost-1.54.0-locale-unused_typedef.patch
Normal file
11
boost-1.54.0-locale-unused_typedef.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp
|
||||
--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200
|
||||
+++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200
|
||||
@@ -27,7 +27,6 @@ namespace boundary {
|
||||
int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end)
|
||||
{
|
||||
typedef LeftIterator left_iterator;
|
||||
- typedef RightIterator right_iterator;
|
||||
typedef typename std::iterator_traits<left_iterator>::value_type char_type;
|
||||
typedef std::char_traits<char_type> traits;
|
||||
while(l_begin!=l_end && r_begin!=r_end) {
|
||||
19
boost-1.57.0-spirit-unused_typedef.patch
Normal file
19
boost-1.57.0-spirit-unused_typedef.patch
Normal file
@ -0,0 +1,19 @@
|
||||
diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
|
||||
--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200
|
||||
+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100
|
||||
@@ -282,12 +282,12 @@ struct grammar_definition
|
||||
#if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
|
||||
typedef impl::grammar_helper_base<GrammarT> helper_base_t;
|
||||
typedef grammar_helper_list<GrammarT> helper_list_t;
|
||||
- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
|
||||
|
||||
helper_list_t& helpers =
|
||||
grammartract_helper_list::do_(self);
|
||||
|
||||
# if defined(BOOST_INTEL_CXX_VERSION)
|
||||
+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
|
||||
for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
|
||||
(*i)->undefine(self);
|
||||
# else
|
||||
|
||||
Diff finished. Tue Jan 20 13:25:53 2015
|
||||
41
mysql5-s390-tsc.patch
Normal file
41
mysql5-s390-tsc.patch
Normal file
@ -0,0 +1,41 @@
|
||||
Support s390/s390x in performance schema's cycle-counting functions.
|
||||
Filed upstream at http://bugs.mysql.com/bug.php?id=59953
|
||||
|
||||
|
||||
diff -up --recursive mysql-5.7.9.orig/include/my_rdtsc.h mysql-5.7.9/include/my_rdtsc.h
|
||||
--- mysql-5.7.9.orig/include/my_rdtsc.h 2015-10-12 08:21:33.000000000 +0200
|
||||
+++ mysql-5.7.9/include/my_rdtsc.h 2015-11-10 16:33:36.037432669 +0100
|
||||
@@ -125,6 +125,7 @@ C_MODE_END
|
||||
#define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26
|
||||
#define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27
|
||||
#define MY_TIMER_ROUTINE_ASM_AARCH64 28
|
||||
+#define MY_TIMER_ROUTINE_ASM_S390 29
|
||||
|
||||
#endif
|
||||
|
||||
diff -up --recursive mysql-5.7.9.orig/mysys/my_rdtsc.c mysql-5.7.9/mysys/my_rdtsc.c
|
||||
--- mysql-5.7.9.orig/mysys/my_rdtsc.c 2015-10-12 08:21:33.000000000 +0200
|
||||
+++ mysql-5.7.9/mysys/my_rdtsc.c 2015-11-10 16:33:36.038432668 +0100
|
||||
@@ -183,6 +183,13 @@ ulonglong my_timer_cycles(void)
|
||||
__asm __volatile__ ("mrs %[rt],cntvct_el0" : [rt] "=r" (result));
|
||||
return result;
|
||||
}
|
||||
+#elif defined(__GNUC__) && defined(__s390__)
|
||||
+ /* covers both s390 and s390x */
|
||||
+ {
|
||||
+ ulonglong result;
|
||||
+ __asm__ __volatile__ ("stck %0" : "=Q" (result) : : "cc");
|
||||
+ return result;
|
||||
+ }
|
||||
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
|
||||
/* gethrtime may appear as either cycle or nanosecond counter */
|
||||
return (ulonglong) gethrtime();
|
||||
@@ -487,6 +494,8 @@ void my_timer_init(MY_TIMER_INFO *mti)
|
||||
mti->cycles.routine= MY_TIMER_ROUTINE_ASM_GCC_SPARC32;
|
||||
#elif defined(__GNUC__) && defined(__aarch64__)
|
||||
mti->cycles.routine= MY_TIMER_ROUTINE_ASM_AARCH64;
|
||||
+#elif defined(__GNUC__) && defined(__s390__)
|
||||
+ mti->cycles.routine= MY_TIMER_ROUTINE_ASM_S390;
|
||||
#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
|
||||
mti->cycles.routine= MY_TIMER_ROUTINE_GETHRTIME;
|
||||
#else
|
||||
55
mysql5.spec
55
mysql5.spec
@ -33,10 +33,10 @@
|
||||
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Name: mysql5
|
||||
Version: 5.7.21
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: MySQL client programs and shared libraries
|
||||
URL: http://www.mysql.com
|
||||
License: GPLv2 with exceptions and LGPLv2 and BSD
|
||||
License: GPLv2 and LGPLv2 and BSD
|
||||
Source0: https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-%{version}.tar.gz
|
||||
Source2: mysql_config_multilib.sh
|
||||
Source3: my.cnf.in
|
||||
@ -79,7 +79,7 @@ BuildRequires: systemtap-sdt-devel zlib-devel multilib-rpm-config procps t
|
||||
BuildRequires: perl(Digest::file) perl(Digest::MD5) perl(Env) perl(Exporter) perl(Fcntl)
|
||||
BuildRequires: perl(File::Temp) perl(Data::Dumper) perl(Getopt::Long) perl(IPC::Open3)
|
||||
BuildRequires: perl(JSON) perl(Memoize) perl(Socket) perl(Sys::Hostname) perl(Test::More)
|
||||
BuildRequires: perl(Time::HiRes)
|
||||
BuildRequires: perl(Time::HiRes)
|
||||
%{?with_init_systemd:BuildRequires: systemd}
|
||||
Requires: bash coreutils grep %{name}-common = %{sameevr}
|
||||
Provides: bundled(boost) = 1.59
|
||||
@ -152,7 +152,7 @@ Requires: %{name}-common = %{sameevr} %{_sysconfdir}/my.cnf
|
||||
Requires: %{_sysconfdir}/my.cnf.d %{name}-errmsg = %{sameevr}
|
||||
%{?mecab:Requires: mecab-ipadic}
|
||||
Requires: coreutils
|
||||
Requires(pre): /usr/sbin/useradd
|
||||
Requires(pre): shadow
|
||||
%if %{with init_systemd}
|
||||
Requires: systemd
|
||||
%{?systemd_requires: %systemd_requires}
|
||||
@ -263,34 +263,34 @@ add_test innodb_fts.opt : arm32 FTS issue
|
||||
add_test perfschema.func_file_io : missing hw on arm32
|
||||
add_test perfschema.setup_objects : missing hw on arm32
|
||||
%endif
|
||||
%ifarch ppc64 ppc64le
|
||||
add_test innodb.innodb : missing correct value
|
||||
add_test perfschema.memory_aggregate_no_a : incorrect numbers in output
|
||||
add_test innodb_zip.wl6469 :
|
||||
add_test json.json_functions_innodb :
|
||||
add_test main.ps :
|
||||
add_test main.select_all :
|
||||
add_test main.select_all_bka :
|
||||
add_test main.select_all_bka_nixbnl :
|
||||
add_test main.select_icp_mrr :
|
||||
add_test main.select_icp_mrr_bka :
|
||||
add_test main.select_icp_mrr_bka_nixbnl :
|
||||
add_test main.select_none :
|
||||
add_test main.select_none_bka :
|
||||
add_test main.select_none_bka_nixbnl :
|
||||
add_test main.sp :
|
||||
add_test main.type_float :
|
||||
add_test main.type_newdecimal :
|
||||
add_test main.type_ranges :
|
||||
add_test test_service_sql_api.test_sql_all_col_types :
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
add_test main.mysql_upgrade : Result content mismatch
|
||||
%endif
|
||||
add_test main.grant_alter_user_qa : ssl test disable
|
||||
add_test auth_sec.mysql_ssl_connection : ssl test disable
|
||||
add_test main.events_bugs : ssl test disable
|
||||
add_test main.ssl_crl : ssl test disable
|
||||
add_test main.func_like : ssl test disable
|
||||
add_test main.grant_user_lock_qa : ssl test disable
|
||||
add_test main.events_1 : ssl test disable
|
||||
add_test main.ssl_cipher : ssl test disable
|
||||
add_test main.ssl : ssl test disable
|
||||
add_test auth_sec.ssl_mode : ssl test disable
|
||||
add_test main.openssl_1 : ssl test disable
|
||||
add_test auth_sec.tls : ssl test disable
|
||||
add_test binlog.binlog_grant_alter_user : ssl test disable
|
||||
add_test auth_sec.cert_verify : ssl test disable
|
||||
add_test main.mysqldump : ssl test disable
|
||||
add_test main.ssl_8k_key : ssl test disable
|
||||
add_test auth_sec.ssl_auto_detect : ssl test disable
|
||||
add_test main.ssl_ca : ssl test disable
|
||||
add_test auth_sec.openssl_cert_generation : ssl test disable
|
||||
add_test main.ssl_compress : ssl test disable
|
||||
add_test main.plugin_auth_sha256_tls : ssl test disable
|
||||
add_test main.mysql_ssl_default : ssl test disable
|
||||
popd
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
|
||||
%{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE31} scripts
|
||||
|
||||
%build
|
||||
%if %runselftest
|
||||
if [ x"$(id -u)" = "x0" ]; then
|
||||
@ -731,6 +731,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Nov 24 2020 baizhonggui <baizhonggui@huawei.com> - 5.7.21-3
|
||||
- Fix test error
|
||||
|
||||
* Mon Nov 2 2020 baizhonggui <baizhonggui@huawei.com> - 5.7.21-2
|
||||
- Delete unused mode
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user