Skip to content

Commit ee79042

Browse files
committed
Revert "db_mysql: fix ssl enforcement for mysql < 5.7"
This reverts commit 1e46a4b.
1 parent 90a0079 commit ee79042

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

modules/db_mysql/my_con.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,8 @@ int db_mysql_connect(struct my_con* ptr)
144144
(tls_opts & MY_CON_TLS_CA_DIR) ? ptr->tls_dom->ca_directory:NULL,
145145
(tls_opts & MY_CON_TLS_CIPHERS) ? ptr->tls_dom->ciphers_list:NULL);
146146
}
147-
#ifdef LIBMARIADB
148-
#if (MYSQL_VERSION_ID >= 50700 && MYSQL_VERSION_ID < 80000)
147+
#if (defined LIBMARIADB) || (MYSQL_VERSION_ID < 80000)
149148
mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&use_tls);
150-
#endif
151149
#else
152150
tls_opts = (use_tls?SSL_MODE_PREFERRED:SSL_MODE_DISABLED);
153151
mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (void *)&tls_opts);

0 commit comments

Comments
 (0)