Skip to content

Commit e8514ec

Browse files
Update MySQL CI to 8.4
1 parent e8eb7de commit e8514ec

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/router/src/openssl/include/tls/details/ssl_operation.h b/router/src/openssl/include/tls/details/ssl_operation.h
2+
index 44b980d3e4..bdf79319f2 100644
3+
--- a/router/src/openssl/include/tls/details/ssl_operation.h
4+
+++ b/router/src/openssl/include/tls/details/ssl_operation.h
5+
@@ -91,7 +91,11 @@ class Operation {
6+
7+
BIO *bio_;
8+
SSL *ssl_;
9+
+#if defined (OPENSSL_IS_AWSLC)
10+
+ size_t pending_;
11+
+#else
12+
int pending_;
13+
+#endif
14+
};
15+
};
16+
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/testclients/mysql_client_test.cc b/testclients/mysql_client_test.cc
2-
index f1e6744b..26021419 100644
2+
index 8bc55eda26..a37134221b 100644
33
--- a/testclients/mysql_client_test.cc
44
+++ b/testclients/mysql_client_test.cc
5-
@@ -23050,6 +23050,9 @@ static void test_bug32915973() {
5+
@@ -22324,6 +22324,9 @@ static void test_bug32915973() {
66
mysql_stmt_close(stmt);
77
}
88

@@ -12,21 +12,21 @@ index f1e6744b..26021419 100644
1212
static void test_wl13075() {
1313
int rc;
1414
myheader("test_wl13075");
15-
@@ -23182,6 +23185,7 @@ static void test_wl13075() {
15+
@@ -22456,6 +22459,7 @@ static void test_wl13075() {
1616
DIE_UNLESS(ret_ses_data == nullptr);
1717
}
1818
}
1919
+#endif
2020

21-
static void finish_with_error(MYSQL *con) {
22-
fprintf(stderr, "[%i] %s\n", mysql_errno(con), mysql_error(con));
23-
@@ -23841,7 +23845,9 @@ static struct my_tests_st my_tests[] = {
21+
static void test_bug33535746() {
22+
DBUG_TRACE;
23+
@@ -23770,7 +23774,9 @@ static struct my_tests_st my_tests[] = {
2424
{"test_bug32892045", test_bug32892045},
2525
{"test_bug33164347", test_bug33164347},
2626
{"test_bug32915973", test_bug32915973},
2727
+#if !defined (OPENSSL_IS_AWSLC)
2828
{"test_wl13075", test_wl13075},
2929
+#endif
30-
{"test_bug34007830", test_bug34007830},
3130
{"test_bug33535746", test_bug33535746},
3231
{"test_server_telemetry_traces", test_server_telemetry_traces},
32+
{"test_wl13128", test_wl13128},

tests/ci/integration/run_mysql_integration.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -exu
66

77
source tests/ci/common_posix_setup.sh
88

9-
MYSQL_VERSION_TAG="mysql-8.3.0"
9+
MYSQL_VERSION_TAG="mysql-cluster-8.4.0"
1010
# This directory is specific to the docker image used. Use -DDOWNLOAD_BOOST=1 -DWITH_BOOST=<directory>
1111
# with mySQL to download a compatible boost version locally.
1212
BOOST_INSTALL_FOLDER=/home/dependencies/boost
@@ -39,7 +39,7 @@ cd ${SCRATCH_FOLDER}
3939

4040
function mysql_patch_reminder() {
4141
# Check latest MySQL version. MySQL often updates with large changes depending on OpenSSL all at once, so we pin to a specific version.
42-
LATEST_MYSQL_VERSION_TAG=`git describe --tags --abbrev=0`
42+
LATEST_MYSQL_VERSION_TAG=`git tag --sort=-taggerdate | head -n 1`
4343
if [[ "${LATEST_MYSQL_VERSION_TAG}" != "${MYSQL_VERSION_TAG}" ]]; then
4444
aws cloudwatch put-metric-data --namespace AWS-LC --metric-name MySQLVersionMismatch --value 1
4545
else
@@ -61,12 +61,10 @@ function mysql_run_tests() {
6161
# to testing AWS-LC functionality.
6262
# Tests marked with Bug#0001 use stateful session resumption, otherwise known as session caching. It is known that AWS-LC does not
6363
# currently support this with TLS 1.3.
64-
echo "main.mysqlpump_bugs : Bug#0000 Can't create/open a file ~/dump.sql'
65-
main.restart_server : Bug#0000 mysqld is not managed by supervisor process
64+
echo "main.restart_server : Bug#0000 mysqld is not managed by supervisor process
6665
main.udf_bug35242734 : Bug#0000 mysqld is not managed by supervisor process
6766
main.file_contents : Bug#0000 Cannot open 'INFO_SRC' in ''
6867
main.resource_group_thr_prio_unsupported : Bug#0000 Invalid thread priority value -5
69-
main.dd_upgrade_error : Bug#0000 running mysqld as root
7068
main.dd_upgrade_error_cs : Bug#0000 running mysqld as root
7169
main.basedir : Bug#0000 running mysqld as root
7270
main.lowercase_fs_off : Bug#0000 running mysqld as root
@@ -83,7 +81,7 @@ main.client_ssl_data_print : Bug#0001 AWS-LC does not support Stateful session
8381
main.ssl_cache : Bug#0001 AWS-LC does not support Stateful session resumption (Session Caching).
8482
main.ssl_cache_tls13 : Bug#0001 AWS-LC does not support Stateful session resumption (Session Caching).
8583
"> skiplist
86-
./mtr --suite=main --force --parallel=auto --skip-test-list=${MYSQL_BUILD_FOLDER}/mysql-test/skiplist --retry-failure=3 --retry=3 --report-unstable-tests
84+
./mtr --suite=main --force --parallel=auto --skip-test-list=${MYSQL_BUILD_FOLDER}/mysql-test/skiplist --retry-failure=4 --retry=4 --report-unstable-tests
8785
popd
8886
}
8987

0 commit comments

Comments
 (0)