upgrade to 5.7.38
(cherry picked from commit 6f2a7f4a74d41f04d4db0302039ef08907d16d81)
This commit is contained in:
parent
334a5ef22f
commit
3b1399e60a
67
load_generator.py.py2_py3.patch
Normal file
67
load_generator.py.py2_py3.patch
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
diff -urN mysql-5.7.38.orig/mysql-test/suite/innodb_stress/t/load_generator.py mysql-5.7.38.new/mysql-test/suite/innodb_stress/t/load_generator.py
|
||||||
|
--- mysql-5.7.38.orig/mysql-test/suite/innodb_stress/t/load_generator.py 2022-03-22 01:30:20.000000000 +0800
|
||||||
|
+++ mysql-5.7.38.new/mysql-test/suite/innodb_stress/t/load_generator.py 2022-05-07 14:41:03.555188841 +0800
|
||||||
|
@@ -47,12 +47,12 @@
|
||||||
|
try:
|
||||||
|
self.runme()
|
||||||
|
print >> self.log, "ok"
|
||||||
|
- except Exception, e:
|
||||||
|
+ except Exception as e:
|
||||||
|
self.exception = e
|
||||||
|
try:
|
||||||
|
cursor = self.con.cursor()
|
||||||
|
cursor.execute("INSERT INTO errors VALUES('%s')" % e)
|
||||||
|
- except MySQLdb.Error, e2:
|
||||||
|
+ except MySQLdb.Error as e2:
|
||||||
|
print >> self.log, "caught while inserting error (%s)" % e2
|
||||||
|
print >> self.log, "caught (%s)" % e
|
||||||
|
finally:
|
||||||
|
@@ -147,12 +147,12 @@
|
||||||
|
try:
|
||||||
|
self.runme()
|
||||||
|
print >> self.log, "ok"
|
||||||
|
- except Exception, e:
|
||||||
|
+ except Exception as e:
|
||||||
|
try:
|
||||||
|
cursor = self.con.cursor()
|
||||||
|
cursor.execute("INSERT INTO errors VALUES('%s')" % e)
|
||||||
|
con.commit()
|
||||||
|
- except MySQLdb.Error, e2:
|
||||||
|
+ except MySQLdb.Error as e2:
|
||||||
|
print >> self.log, "caught while inserting error (%s)" % e2
|
||||||
|
|
||||||
|
print >> self.log, "caught (%s)" % e
|
||||||
|
@@ -252,13 +252,13 @@
|
||||||
|
try:
|
||||||
|
self.runme()
|
||||||
|
print >> self.log, "ok, with do_blob %s" % self.do_blob
|
||||||
|
- except Exception, e:
|
||||||
|
+ except Exception as e:
|
||||||
|
|
||||||
|
try:
|
||||||
|
cursor = self.con.cursor()
|
||||||
|
cursor.execute("INSERT INTO errors VALUES('%s')" % e)
|
||||||
|
cursor.execute("COMMIT")
|
||||||
|
- except MySQLdb.Error, e2:
|
||||||
|
+ except MySQLdb.Error as e2:
|
||||||
|
print >> self.log, "caught while inserting error (%s)" % e2
|
||||||
|
|
||||||
|
print >> self.log, "caught (%s)" % e
|
||||||
|
@@ -358,7 +358,7 @@
|
||||||
|
elif r == 4:
|
||||||
|
self.con.rollback()
|
||||||
|
|
||||||
|
- except MySQLdb.Error, e:
|
||||||
|
+ except MySQLdb.Error as e:
|
||||||
|
if e.args[0] == 2006: # server is killed
|
||||||
|
print >> self.log, "mysqld down, transaction %d" % self.xid
|
||||||
|
return
|
||||||
|
@@ -367,7 +367,7 @@
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.con.commit()
|
||||||
|
- except Exception, e:
|
||||||
|
+ except Exception as e:
|
||||||
|
print >> self.log, "commit error %s" % e
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
Binary file not shown.
@ -38,7 +38,7 @@
|
|||||||
%bcond_without conflicts
|
%bcond_without conflicts
|
||||||
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Name: mysql5
|
Name: mysql5
|
||||||
Version: 5.7.37
|
Version: 5.7.38
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: MySQL client programs and shared libraries
|
Summary: MySQL client programs and shared libraries
|
||||||
URL: http://www.mysql.com
|
URL: http://www.mysql.com
|
||||||
@ -69,6 +69,7 @@ Patch70: %{pkgnamepatch}-5.7.9-major.patch
|
|||||||
Patch73: %{pkgnamepatch}-libxcrypt.patch
|
Patch73: %{pkgnamepatch}-libxcrypt.patch
|
||||||
Patch74: fix-innodb.innodb-fail-on-aarch64.patch
|
Patch74: fix-innodb.innodb-fail-on-aarch64.patch
|
||||||
Patch75: fix_grant_user_lock_as_root.patch
|
Patch75: fix_grant_user_lock_as_root.patch
|
||||||
|
Patch76: load_generator.py.py2_py3.patch
|
||||||
Patch115: boost-1.58.0-pool.patch
|
Patch115: boost-1.58.0-pool.patch
|
||||||
Patch125: boost-1.57.0-mpl-print.patch
|
Patch125: boost-1.57.0-mpl-print.patch
|
||||||
Patch170: boost-1.59.0-log.patch
|
Patch170: boost-1.59.0-log.patch
|
||||||
@ -248,6 +249,7 @@ the MySQL sources.
|
|||||||
%patch73 -p1
|
%patch73 -p1
|
||||||
%patch74 -p1
|
%patch74 -p1
|
||||||
%patch75 -p1
|
%patch75 -p1
|
||||||
|
%patch76 -p1
|
||||||
pushd boost/boost_1_59_0
|
pushd boost/boost_1_59_0
|
||||||
%patch115 -p0
|
%patch115 -p0
|
||||||
%patch125 -p1
|
%patch125 -p1
|
||||||
@ -726,6 +728,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat May 7 2022 dillon chen <dillon.chen@gmail.com> - 5.7.38-1
|
||||||
|
- add patch76
|
||||||
|
- Upgrade to 5.7.38 version
|
||||||
|
|
||||||
* Thu Apr 21 2022 bzhaoop <bzhaojyathousandy@gmail.com> - 5.7.37-1
|
* Thu Apr 21 2022 bzhaoop <bzhaojyathousandy@gmail.com> - 5.7.37-1
|
||||||
- Fix CVE issues for bump to the 5.7.37 version
|
- Fix CVE issues for bump to the 5.7.37 version
|
||||||
- CVE-2022-21245
|
- CVE-2022-21245
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user