Skip to content

Commit c91a638

Browse files
author
Axyoan Marcelo
committed
Fix for Bug#111031 (Bug#35392222), Contribution: Update SyntaxRegressionTest.java.
Change-Id: I4c7e4f1e887b49ce7f6559374995eb1a41bfd814
1 parent 00449a4 commit c91a638

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

CHANGES

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
Version 8.4.0
55

6+
- Fix for Bug#111031 (Bug#35392222), Contribution: Update SyntaxRegressionTest.java.
7+
Thanks to Abby Palmero for her contribution.
8+
69
- Fix for Bug#113599 (Bug#36171571), Contribution: Replace StringBuffer with StringBuilder in ValueEncoders.
710
Thanks to Henning Pöttker for his contribution.
811

src/test/java/testsuite/regression/SyntaxRegressionTest.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2002, 2024, Oracle and/or its affiliates.
33
*
44
* This program is free software; you can redistribute it and/or modify it under
55
* the terms of the GNU General Public License, version 2.0, as published by the
@@ -1070,7 +1070,6 @@ public void testJsonType() throws Exception {
10701070
testJsonTypeCheckFunction("SELECT JSON_VALID('{\"a\": 1}')", "1");
10711071
}
10721072

1073-
@Test
10741073
private void testJsonTypeCheckFunction(String sql, String expectedResult) throws Exception {
10751074
this.rs = this.stmt.executeQuery(sql);
10761075
assertTrue(this.rs.next());
@@ -1304,7 +1303,6 @@ public void testCreateTablespace() throws Exception {
13041303
}
13051304
}
13061305

1307-
@Test
13081306
private void testCreateTablespaceCheckTablespaces(int expectedTsCount) throws Exception {
13091307
if (versionMeetsMinimum(8, 0, 3)) {
13101308
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
13151313
assertEquals(expectedTsCount, this.rs.getInt(1));
13161314
}
13171315

1318-
@Test
13191316
private void testCreateTablespaceCheckTables(String tablespace, int expectedTblCount) throws Exception {
13201317
if (versionMeetsMinimum(8, 0, 3)) {
13211318
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 {
13741371
testSetMergeThresholdIndices(tableMergeThreshold, keyMergeThresholds);
13751372
}
13761373

1377-
@Test
13781374
private void testSetMergeThresholdIndices(int defaultMergeThreshold, Map<String, Integer> keyMergeThresholds) throws Exception {
13791375
boolean dbMapsToSchema = ((JdbcConnection) this.conn).getPropertySet().<DatabaseTerm>getEnumProperty(PropertyKey.databaseTerm)
13801376
.getValue() == DatabaseTerm.SCHEMA;

src/test/java/testsuite/simple/StatementsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2002, 2024, Oracle and/or its affiliates.
33
*
44
* This program is free software; you can redistribute it and/or modify it under
55
* the terms of the GNU General Public License, version 2.0, as published by the
@@ -216,7 +216,6 @@ public void testBinaryResultSetNumericTypes() throws Exception {
216216
sspsConn.close();
217217
}
218218

219-
@Test
220219
private void testBinaryResultSetNumericTypesInternal(Connection con) throws Exception {
221220
/*
222221
* TINYINT 1 -128 127 SMALLINT 2 -32768 32767 MEDIUMINT 3 -8388608

0 commit comments

Comments
 (0)