!25 Fix tests fail in local rpmbuild
From: @ultra_planet Reviewed-by: @si-gui,@bzhaoop Signed-off-by:
This commit is contained in:
openeuler-ci-bot
Gitee
commit
292897de9b
25
fix-innodb.innodb-fail-on-aarch64.patch
Normal file
25
fix-innodb.innodb-fail-on-aarch64.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 5729cb28f7e332adbcb8cfc4931af0944d3ff71d Mon Sep 17 00:00:00 2001
|
||||
From: lingsheng <lingsheng@huawei.com>
|
||||
Date: Fri, 19 Mar 2021 22:47:55 +0800
|
||||
Subject: [PATCH] fix innodb.innodb fail on aarch64
|
||||
|
||||
---
|
||||
mysql-test/suite/innodb/t/innodb.test | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
|
||||
index 679d251d..7e4c0ee5 100644
|
||||
--- a/mysql-test/suite/innodb/t/innodb.test
|
||||
+++ b/mysql-test/suite/innodb/t/innodb.test
|
||||
@@ -1333,7 +1333,7 @@ drop table t1;
|
||||
# Test for testable InnoDB status variables. This test
|
||||
# uses previous ones(pages_created, rows_deleted, ...).
|
||||
--disable_warnings
|
||||
---replace_result 1535 {checked_valid} 1536 {checked_valid} 3071 {checked_valid} 3072 {checked_valid} 6144 {checked_valid}
|
||||
+--replace_result 1535 {checked_valid} 1536 {checked_valid} 3071 {checked_valid} 3072 {checked_valid} 6144 {checked_valid} 1539 {checked_valid}
|
||||
SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
|
||||
--replace_result 4096 {checked_valid} 8192 {checked_valid} 16384 {checked_valid}
|
||||
SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
|
||||
--
|
||||
2.23.0
|
||||
|
||||
85
fix_grant_user_lock_as_root.patch
Normal file
85
fix_grant_user_lock_as_root.patch
Normal file
@ -0,0 +1,85 @@
|
||||
Description: Fixes test failing when run as root
|
||||
Certain tests will fail when run as root. This patch fixes one,
|
||||
main.grant_user_lock, which tries to test an anonymous user in
|
||||
a way that fails when running as root. The patch fixes only
|
||||
this test because there have been issues in Debian with only
|
||||
this test failing in this way.
|
||||
Author: Lars Tangvald <lars.tangvald@oracle.com>
|
||||
Bug-Debian: https://bugs.debian.org/841592
|
||||
Bug: http://bugs.mysql.com/bug.php?id=83751
|
||||
Last-Update: 2016-11-09
|
||||
|
||||
--- mysql-5.7-5.7.16.orig/mysql-test/r/grant_user_lock.result
|
||||
+++ mysql-5.7-5.7.16/mysql-test/r/grant_user_lock.result
|
||||
@@ -98,13 +98,13 @@ CURRENT_USER()
|
||||
DROP USER ''@localhost;
|
||||
# Create anonymous user - LOCK
|
||||
CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT LOCK;
|
||||
-connect(localhost,,pass,test,MASTER_PORT,MASTER_SOCKET);
|
||||
+connect(localhost, ,pass,test,MASTER_PORT,MASTER_SOCKET);
|
||||
ERROR HY000: Access denied for user '(null)'@'localhost'. Account is locked.
|
||||
DROP USER ''@localhost;
|
||||
# Disabling anonymous user
|
||||
CREATE USER ''@localhost IDENTIFIED BY 'pass';
|
||||
ALTER USER ''@localhost ACCOUNT LOCK;
|
||||
-connect(localhost,,pass,test,MASTER_PORT,MASTER_SOCKET);
|
||||
+connect(localhost, ,pass,test,MASTER_PORT,MASTER_SOCKET);
|
||||
ERROR HY000: Access denied for user '(null)'@'localhost'. Account is locked.
|
||||
DROP USER ''@localhost;
|
||||
# Enabling anonymous user
|
||||
--- mysql-5.7-5.7.16.orig/mysql-test/t/grant_user_lock.test
|
||||
+++ mysql-5.7-5.7.16/mysql-test/t/grant_user_lock.test
|
||||
@@ -113,7 +113,7 @@ DROP USER unlocked_user2@localhost;
|
||||
--echo # Create anonymous user
|
||||
connection default;
|
||||
CREATE USER ''@localhost IDENTIFIED BY 'pass';
|
||||
-connect(anonymous_user_con, localhost, '', pass);
|
||||
+connect(anonymous_user_con, localhost, ' ', pass);
|
||||
SELECT CURRENT_USER();
|
||||
disconnect anonymous_user_con;
|
||||
connection default;
|
||||
@@ -122,7 +122,7 @@ DROP USER ''@localhost;
|
||||
--echo # Create anonymous user - explicit UNLOCK
|
||||
connection default;
|
||||
CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT UNLOCK;
|
||||
-connect(anonymous_user_con, localhost, '', pass);
|
||||
+connect(anonymous_user_con, localhost, ' ', pass);
|
||||
SELECT CURRENT_USER();
|
||||
disconnect anonymous_user_con;
|
||||
connection default;
|
||||
@@ -133,7 +133,7 @@ connection default;
|
||||
CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT LOCK;
|
||||
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
||||
--error ER_ACCOUNT_HAS_BEEN_LOCKED
|
||||
-connect(anonymous_user_con, localhost, '', pass);
|
||||
+connect(anonymous_user_con, localhost, ' ', pass);
|
||||
connection default;
|
||||
DROP USER ''@localhost;
|
||||
|
||||
@@ -143,7 +143,7 @@ CREATE USER ''@localhost IDENTIFIED BY '
|
||||
ALTER USER ''@localhost ACCOUNT LOCK;
|
||||
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
||||
--error ER_ACCOUNT_HAS_BEEN_LOCKED
|
||||
-connect(anonymous_user_con, localhost, '', pass);
|
||||
+connect(anonymous_user_con, localhost, ' ', pass);
|
||||
connection default;
|
||||
DROP USER ''@localhost;
|
||||
|
||||
@@ -151,7 +151,7 @@ DROP USER ''@localhost;
|
||||
connection default;
|
||||
CREATE USER ''@localhost IDENTIFIED BY 'pass' ACCOUNT LOCK;
|
||||
ALTER USER ''@localhost ACCOUNT UNLOCK;
|
||||
-connect(anonymous_user_con, localhost, '', pass);
|
||||
+connect(anonymous_user_con, localhost, ' ', pass);
|
||||
SELECT CURRENT_USER();
|
||||
disconnect anonymous_user_con;
|
||||
connection default;
|
||||
@@ -171,7 +171,7 @@ connection default;
|
||||
CREATE user ''@localhost IDENTIFIED BY 'pass';
|
||||
CREATE USER 'unlocked_user'@localhost IDENTIFIED BY 'pass';
|
||||
|
||||
-connect(anonymous_user_con, localhost, '', pass);
|
||||
+connect(anonymous_user_con, localhost, ' ', pass);
|
||||
--error ER_TABLEACCESS_DENIED_ERROR
|
||||
UPDATE mysql.user SET account_locked='Y'
|
||||
WHERE user='unlocked_user' and host = 'localhost';
|
||||
13
mysql5.spec
13
mysql5.spec
@ -33,7 +33,7 @@
|
||||
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Name: mysql5
|
||||
Version: 5.7.21
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: MySQL client programs and shared libraries
|
||||
URL: http://www.mysql.com
|
||||
License: GPLv2 with exceptions and LGPLv2 and BSD
|
||||
@ -65,6 +65,8 @@ Patch70: %{pkgnamepatch}-5.7.9-major.patch
|
||||
Patch71: %{pkgnamepatch}-openssl11.patch
|
||||
Patch72: %{pkgnamepatch}-tirpc.patch
|
||||
Patch73: %{pkgnamepatch}-libxcrypt.patch
|
||||
Patch74: fix-innodb.innodb-fail-on-aarch64.patch
|
||||
Patch75: fix_grant_user_lock_as_root.patch
|
||||
Patch115: boost-1.58.0-pool.patch
|
||||
Patch125: boost-1.57.0-mpl-print.patch
|
||||
Patch170: boost-1.59.0-log.patch
|
||||
@ -245,6 +247,8 @@ the MySQL sources.
|
||||
%patch71 -p1
|
||||
%patch72 -p1
|
||||
%patch73 -p1
|
||||
%patch74 -p1
|
||||
%patch75 -p1
|
||||
pushd boost/boost_1_59_0
|
||||
%patch115 -p0
|
||||
%patch125 -p1
|
||||
@ -288,6 +292,8 @@ 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
|
||||
add_test innodb.innodb-multiple-tablespaces : fail on glibc 2.33
|
||||
add_test innodb.alter_kill : fail on glibc 2.33
|
||||
popd
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
|
||||
%{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE31} scripts
|
||||
@ -731,5 +737,10 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Mar 19 2021 lingsheng <lingsheng@huawei.com> - 5.7.21-2
|
||||
- Fix innodb.innodb fail on aarch64
|
||||
- Fix grant_user_lock as root
|
||||
- Update fail tests list on glibc 2.33
|
||||
|
||||
* Thu Oct 15 2020 zhanghua <zhanghua40@huawei.com> - 5.7.21-1
|
||||
- package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user