Sfoglia il codice sorgente

Revert "db_mysql: fix build for older releases"

it doesn't fix anything

This reverts commit f0e73eabee3be198dbad2e50752d9889e4aa8e5f.
Victor Seva 1 anno fa
parent
commit
2cb2e5c99c
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      src/modules/db_mysql/km_my_con.c

+ 2 - 2
src/modules/db_mysql/km_my_con.c

@@ -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
@@ -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) {
@@ -155,7 +155,6 @@ 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) - "
@@ -163,6 +162,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id)
 				(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 */