diff --git a/load_generator.py.py2_py3.patch b/load_generator.py.py2_py3.patch new file mode 100644 index 0000000000000000000000000000000000000000..1d115e7dc447d466d97eac40370d04a1cb270be9 --- /dev/null +++ b/load_generator.py.py2_py3.patch @@ -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__': diff --git a/mysql-boost-5.7.37.tar.gz b/mysql-boost-5.7.38.tar.gz similarity index 80% rename from mysql-boost-5.7.37.tar.gz rename to mysql-boost-5.7.38.tar.gz index 58e33862cbbf5b7bf31ebe13199ea4f3b68401a1..fa401074b07e903fcd1fbb6a718786b9c9085321 100644 Binary files a/mysql-boost-5.7.37.tar.gz and b/mysql-boost-5.7.38.tar.gz differ diff --git a/mysql5.spec b/mysql5.spec index c83ce8357a4c21580eb130ea08368c313fdd20ba..3382790b06ca95a84767f628a8d44671075bd134 100644 --- a/mysql5.spec +++ b/mysql5.spec @@ -38,7 +38,7 @@ %bcond_without conflicts %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql5 -Version: 5.7.37 +Version: 5.7.38 Release: 1 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -69,6 +69,7 @@ Patch70: %{pkgnamepatch}-5.7.9-major.patch Patch73: %{pkgnamepatch}-libxcrypt.patch Patch74: fix-innodb.innodb-fail-on-aarch64.patch Patch75: fix_grant_user_lock_as_root.patch +Patch76: load_generator.py.py2_py3.patch Patch115: boost-1.58.0-pool.patch Patch125: boost-1.57.0-mpl-print.patch Patch170: boost-1.59.0-log.patch @@ -248,6 +249,7 @@ the MySQL sources. %patch73 -p1 %patch74 -p1 %patch75 -p1 +%patch76 -p1 pushd boost/boost_1_59_0 %patch115 -p0 %patch125 -p1 @@ -726,6 +728,10 @@ fi %endif %changelog +* Sat May 7 2022 dillon chen - 5.7.38-1 +- add patch76 +- Upgrade to 5.7.38 version + * Thu Apr 21 2022 bzhaoop - 5.7.37-1 - Fix CVE issues for bump to the 5.7.37 version - CVE-2022-21245