Move proxysqlTap_find_charset_collate out of utils.cpp

proxysqlTap_find_charset_collate() has been moved out of utils.cpp to allow statically linking
sysown · Aug 18, 2023 · c2d6324 · c2d6324
1 parent fbdb1c6
commit c2d6324
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/test/tap/tap/utils.cpp b/test/tap/tap/utils.cpp
@@ -595,17 +595,6 @@ int wait_for_replication(
 	return result;
 }
 
-MARIADB_CHARSET_INFO * proxysqlTap_find_charset_collate(const char *collatename) {
-	MARIADB_CHARSET_INFO *c = (MARIADB_CHARSET_INFO *)mariadb_compiled_charsets;
-	do {
-		if (!strcasecmp(c->name, collatename)) {
-			return c;
-		}
-		++c;
-	} while (c[0].nr != 0);
-	return NULL;
-}
-
 int create_proxysql_user(
 	MYSQL* proxysql_admin,
 	const string& user,

diff --git a/test/tap/tap/utils.h b/test/tap/tap/utils.h
@@ -179,11 +179,13 @@ int wait_for_replication(
  * NOTE: This is a duplicate of 'proxysql_find_charset_collate' in 'MySQL_Variables.h'. Including
  * 'MySQL_Variables' is not a easy task due to its interdependeces with other ProxySQL modules.
  */
+/*
 #ifdef LIBMYSQL_HELPER
 MY_CHARSET_INFO * proxysqlTap_find_charset_collate(const char *collatename);
 #else
 MARIADB_CHARSET_INFO * proxysqlTap_find_charset_collate(const char *collatename);
 #endif
+*/
 /**
  * @brief Creates the new supplied user in ProxySQL with the provided
  *   attributes.

diff --git a/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp b/test/tap/tests/test_com_reset_connection_com_change_user-t.cpp
@@ -40,6 +40,17 @@ const std::vector<std::string> tracked_variables {
 	"wsrep_sync_wait"
 };
 
+MARIADB_CHARSET_INFO * proxysqlTap_find_charset_collate(const char *collatename) {
+	MARIADB_CHARSET_INFO *c = (MARIADB_CHARSET_INFO *)mariadb_compiled_charsets;
+	do {
+		if (!strcasecmp(c->name, collatename)) {
+			return c;
+		}
+		++c;
+	} while (c[0].nr != 0);
+	return NULL;
+}
+
 void variable_rows_to_json(MYSQL_RES *result, json& j) {
 	if(!result) return;
 	MYSQL_ROW row;

diff --git a/test/tap/tests/test_set_collation-t.cpp b/test/tap/tests/test_set_collation-t.cpp
@@ -18,6 +18,17 @@
 #define N_ITERATION_2  2
 #define N_ITERATION_3  3
 
+MARIADB_CHARSET_INFO * proxysqlTap_find_charset_collate(const char *collatename) {
+	MARIADB_CHARSET_INFO *c = (MARIADB_CHARSET_INFO *)mariadb_compiled_charsets;
+	do {
+		if (!strcasecmp(c->name, collatename)) {
+			return c;
+		}
+		++c;
+	} while (c[0].nr != 0);
+	return NULL;
+}
+
 /**
  * @brief Creates a different MYSQL connection for each supplied collation. Logs in case of a
  *  failure creating a connection.