Fix for Bug#111031 (Bug#35392222), Contribution: Update SyntaxRegress…

…ionTest.java. Change-Id: I4c7e4f1e887b49ce7f6559374995eb1a41bfd814
mysql · Feb 17, 2024 · c91a638 · c91a638
1 parent 00449a4
commit c91a638
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,9 @@
 
 Version 8.4.0
 
+  - Fix for Bug#111031 (Bug#35392222), Contribution: Update SyntaxRegressionTest.java.
+    Thanks to Abby Palmero for her contribution.
+
   - Fix for Bug#113599 (Bug#36171571), Contribution: Replace StringBuffer with StringBuilder in ValueEncoders.
     Thanks to Henning Pöttker for his contribution.
 

diff --git a/src/test/java/testsuite/regression/SyntaxRegressionTest.java b/src/test/java/testsuite/regression/SyntaxRegressionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
@@ -1070,7 +1070,6 @@ public void testJsonType() throws Exception {
         testJsonTypeCheckFunction("SELECT JSON_VALID('{\"a\": 1}')", "1");
     }
 
-    @Test
     private void testJsonTypeCheckFunction(String sql, String expectedResult) throws Exception {
         this.rs = this.stmt.executeQuery(sql);
         assertTrue(this.rs.next());
@@ -1304,7 +1303,6 @@ public void testCreateTablespace() throws Exception {
         }
     }
 
-    @Test
     private void testCreateTablespaceCheckTablespaces(int expectedTsCount) throws Exception {
         if (versionMeetsMinimum(8, 0, 3)) {
             this.rs = this.stmt.executeQuery("SELECT COUNT(*) FROM information_schema.innodb_tablespaces WHERE name LIKE 'testTs_'");
@@ -1315,7 +1313,6 @@ private void testCreateTablespaceCheckTablespaces(int expectedTsCount) throws Ex
         assertEquals(expectedTsCount, this.rs.getInt(1));
     }
 
-    @Test
     private void testCreateTablespaceCheckTables(String tablespace, int expectedTblCount) throws Exception {
         if (versionMeetsMinimum(8, 0, 3)) {
             this.rs = this.stmt.executeQuery("SELECT COUNT(*) FROM information_schema.innodb_tables a, information_schema.innodb_tablespaces b "
@@ -1374,7 +1371,6 @@ public void testSetMergeThreshold() throws Exception {
         testSetMergeThresholdIndices(tableMergeThreshold, keyMergeThresholds);
     }
 
-    @Test
     private void testSetMergeThresholdIndices(int defaultMergeThreshold, Map<String, Integer> keyMergeThresholds) throws Exception {
         boolean dbMapsToSchema = ((JdbcConnection) this.conn).getPropertySet().<DatabaseTerm>getEnumProperty(PropertyKey.databaseTerm)
                 .getValue() == DatabaseTerm.SCHEMA;

diff --git a/src/test/java/testsuite/simple/StatementsTest.java b/src/test/java/testsuite/simple/StatementsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
@@ -216,7 +216,6 @@ public void testBinaryResultSetNumericTypes() throws Exception {
         sspsConn.close();
     }
 
-    @Test
     private void testBinaryResultSetNumericTypesInternal(Connection con) throws Exception {
         /*
          * TINYINT 1 -128 127 SMALLINT 2 -32768 32767 MEDIUMINT 3 -8388608