From f93ec31d73e8ecaa57253e3dc235df03ca7d18e1 Mon Sep 17 00:00:00 2001
From: Rene Cannao <rene@proxysql.com>
Date: Sun, 8 Mar 2026 02:18:45 +0000
Subject: [PATCH] Fix compilation errors in TAP tests

- charset_unsigned_int-t.cpp: Fix misplaced closing brace and return.
- test_auth_methods-t.cpp: Correctly declare and use has_sha2 scope.
- test_cluster_sync-t.cpp: Replace remaining system() calls with dump_mysql_servers lambda.
---
 test/tap/tests/charset_unsigned_int-t.cpp |  9 ++++-----
 test/tap/tests/test_auth_methods-t.cpp    | 18 ++++++++++++------
 test/tap/tests/test_cluster_sync-t.cpp    |  8 ++++----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/test/tap/tests/charset_unsigned_int-t.cpp b/test/tap/tests/charset_unsigned_int-t.cpp
index 07c974949..80880ce37 100644
--- a/test/tap/tests/charset_unsigned_int-t.cpp
+++ b/test/tap/tests/charset_unsigned_int-t.cpp
@@ -113,14 +113,13 @@ int main(int argc, char** argv) {
     if (mysql_query(mysql_a, "update global_variables set variable_value='utf8mb4' where variable_name='mysql-default_charset'")) { diag("Update to utf8mb4 failed: %s", mysql_error(mysql_a)); return exit_status(); }
     if (mysql_query(mysql_a, "load mysql variables to runtime")) { diag("LOAD failed: %s", mysql_error(mysql_a)); return exit_status(); }
     if (mysql_query(mysql_a, "save mysql variables to disk")) { diag("SAVE failed: %s", mysql_error(mysql_a)); return exit_status(); }
-show_admin_global_variable(mysql_a, var_name, var_value);
-ok(var_value.compare("utf8mb4") == 0, "Default charset utf8mb4 is set in admin. Actual %s", var_value.c_str());
 
-mysql_close(mysql_a);
+    show_admin_global_variable(mysql_a, var_name, var_value);
+    ok(var_value.compare("utf8mb4") == 0, "Default charset utf8mb4 is set in admin. Actual %s", var_value.c_str());
 
-return exit_status();
-}
+    mysql_close(mysql_a);
 
+    MYSQL* mysql_c = mysql_init(NULL);
     if (!mysql_c) return exit_status();
     if (mysql_options(mysql_c, MYSQL_SET_CHARSET_NAME, "utf8mb4")) return exit_status();
     if (!mysql_real_connect(mysql_c, cl.host, cl.username, cl.password, NULL, cl.port, NULL, 0)) {
diff --git a/test/tap/tests/test_auth_methods-t.cpp b/test/tap/tests/test_auth_methods-t.cpp
index d5b84e8d4..076dce89b 100644
--- a/test/tap/tests/test_auth_methods-t.cpp
+++ b/test/tap/tests/test_auth_methods-t.cpp
@@ -1135,6 +1135,7 @@ int main(int argc, char** argv) {
 
 	bool is_mariadb = (version_str.find("MariaDB") != string::npos);
 	unsigned long server_version = mysql_get_server_version(mysql);
+	bool has_sha2 = true;
 
 	if (server_version < 80000 && !is_mariadb) {
 		diag("This test requires MySQL 8.0+ but backend is version %lu. Skipping.", server_version);
@@ -1216,15 +1217,20 @@ int main(int argc, char** argv) {
 
 	uint32_t NUM_CLIENT_THREADS = 4;
 
-	const vector<string> def_auths {
-		"mysql_native_password",
-		"caching_sha2_password"
+	vector<string> def_auths {
+		"mysql_native_password"
 	};
-	const vector<string> req_auths {
+	if (has_sha2) {
+		def_auths.push_back("caching_sha2_password");
+	}
+
+	vector<string> req_auths {
 		"mysql_clear_password",
-		"mysql_native_password",
-		"caching_sha2_password"
+		"mysql_native_password"
 	};
+	if (has_sha2) {
+		req_auths.push_back("caching_sha2_password");
+	}
 	const vector<bool> hash_pass { false, true };
 	const vector<bool> use_ssl { false, true };
 	const vector<bool> use_comp { false, true };
diff --git a/test/tap/tests/test_cluster_sync-t.cpp b/test/tap/tests/test_cluster_sync-t.cpp
index 0a23d524a..8eb1b74ab 100644
--- a/test/tap/tests/test_cluster_sync-t.cpp
+++ b/test/tap/tests/test_cluster_sync-t.cpp
@@ -324,8 +324,8 @@ int check_mysql_servers_sync(
 	}
 	MYSQL_QUERY(proxy_admin, "LOAD MYSQL SERVERS TO RUNTIME");
 
-	std::cout << "MASTER TABLE BEFORE SYNC:" << std::endl;
-	system(print_master_mysql_servers_hostgroups.c_str());
+	diag("MASTER TABLE BEFORE SYNC:");
+	dump_mysql_servers(proxy_admin, "Master");
 
 	// SYNCH CHECK
 
@@ -357,8 +357,8 @@ int check_mysql_servers_sync(
 		}
 	}
 
-	std::cout << "REPLICA TABLE AFTER SYNC:" << std::endl;
-	system(print_replica_mysql_servers_hostgroups.c_str());
+	diag("REPLICA TABLE AFTER SYNC:");
+	dump_mysql_servers(r_proxy_admin, "Replica");
 	ok(not_synced_query == false, "'mysql_servers' with NULL comments should be synced.");
 
 	// TEARDOWN CONFIG