Skip to content

Commit

Permalink
Revert "db_mysql: fix build for older releases"
Browse files Browse the repository at this point in the history
it doesn't fix anything

This reverts commit f0e73ea.
  • Loading branch information
linuxmaniac committed Feb 3, 2024
1 parent 80214d2 commit 2cb2e5c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/modules/db_mysql/km_my_con.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ struct my_con *db_mysql_new_connection(const struct db_id *id)
mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT,
(const void *)&db_mysql_timeout_interval);

#if MYSQL_VERSION_ID > 50710
#ifdef MARIADB_BASE_VERSION
/*
* emulate SSL_MODE_XXXX from MySQL
Expand All @@ -142,6 +141,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id)
break;
}
#else
#if MYSQL_VERSION_ID > 50710
if(db_mysql_opt_ssl_mode != 0) {
unsigned int optuint = 0;
if(db_mysql_opt_ssl_mode == 1) {
Expand All @@ -155,14 +155,14 @@ struct my_con *db_mysql_new_connection(const struct db_id *id)
}
mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void *)&optuint);
}
#endif /* MARIADB_BASE_VERSION */
#else
if(db_mysql_opt_ssl_mode != 0) {
LM_WARN("ssl mode not supported by mysql version (value %u) - "
"ignoring\n",
(unsigned int)db_mysql_opt_ssl_mode);
}
#endif /* MYSQL_VERSION_ID */
#endif /* MARIADB_BASE_VERSION */

#if MYSQL_VERSION_ID > 50012
/* set reconnect flag if enabled */
Expand Down

0 comments on commit 2cb2e5c

Please sign in to comment.