Rebase to version 8.0.28

This commit is contained in:
Zuzana Miklankova 2022-01-18 15:13:55 +01:00
commit ceef1d97bc
6 changed files with 52 additions and 44 deletions

View file

@ -1,17 +1,17 @@
From b113bc5ed38da669a0cf2b88bf35905218b01cfd Mon Sep 17 00:00:00 2001
From b9a7a929f547d1408c42aca31603d52518f6296b Mon Sep 17 00:00:00 2001
From: Zuzana Miklankova <zmiklank@redhat.com>
Date: Tue, 19 Oct 2021 15:31:36 +0200
Subject: [PATCH] removing StatementsTest because of missing dependencies
Date: Tue, 18 Jan 2022 15:04:09 +0100
Subject: [PATCH] patch
---
.../regression/StatementRegressionTest.java | 51 -------------------
1 file changed, 51 deletions(-)
.../regression/StatementRegressionTest.java | 50 -------------------
1 file changed, 50 deletions(-)
diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java
index 5845c71e..f68fd9dd 100644
index b5c53e9a..89483a07 100644
--- a/src/test/java/testsuite/regression/StatementRegressionTest.java
+++ b/src/test/java/testsuite/regression/StatementRegressionTest.java
@@ -151,7 +151,6 @@ import com.mysql.cj.util.TimeUtil;
@@ -154,7 +154,6 @@ import com.mysql.cj.util.TimeUtil;
import testsuite.BaseQueryInterceptor;
import testsuite.BaseTestCase;
import testsuite.UnreliableSocketFactory;
@ -19,7 +19,7 @@ index 5845c71e..f68fd9dd 100644
/**
* Regression tests for the Statement class
@@ -11599,21 +11598,6 @@ public class StatementRegressionTest extends BaseTestCase {
@@ -11602,20 +11601,6 @@ public class StatementRegressionTest extends BaseTestCase {
}
}
@ -37,15 +37,13 @@ index 5845c71e..f68fd9dd 100644
- return null;
- });
- }
-
/**
* Tests fix for Bug#71929 (18346501), Prefixing query with double comments cancels query DML validation.
*
@@ -11639,39 +11623,4 @@ public class StatementRegressionTest extends BaseTestCase {
});
@@ -11643,41 +11628,6 @@ public class StatementRegressionTest extends BaseTestCase {
}
}
-
- /**
- * Test fix for Bug#103612 (32902019), Incorrectly identified WITH...SELECT as unsafe for read-only connections.
- *
@ -80,7 +78,10 @@ index 5845c71e..f68fd9dd 100644
- testConn.close();
- } while ((useSPS = !useSPS) || (readOnly = !readOnly));
- }
}
-
/**
* Tests fix for Bug#101389 (32089018), GETWARNINGS SHOULD CHECK WARNING COUNT BEFORE SENDING SHOW.
*
--
2.31.1
2.34.1