Merge pull request #5251 from sysown/v3.0-set_testing_version

renecannao · web-flow · commit fd6cd76b7f83 · 2025-12-17T16:37:19.000+07:00
Add comments to select @@Version queries to bypass ProxySQL interception
diff --git a/test/tap/tap/utils.cpp b/test/tap/tap/utils.cpp
@@ -400,7 +400,7 @@ int set_admin_global_variable(MYSQL *mysql, const string& var_name, const string
 int get_server_version(MYSQL *mysql, string& version) {
 	char query[128];
 
-	if (mysql_query(mysql, "select @@version")) {
+	if (mysql_query(mysql, "select /* set_testing */ @@version")) {
 		fprintf(stderr, "Error %d, %s\n",
 				mysql_errno(mysql), mysql_error(mysql));
 		return exit_status();
diff --git a/test/tap/tests/set_testing-240.h b/test/tap/tests/set_testing-240.h
@@ -474,7 +474,7 @@ int detect_version(CommandLine& cl, bool& is_mariadb) {
 		return 1;
 	}
 
-	MYSQL_QUERY(mysql, "select @@version");
+	MYSQL_QUERY(mysql, "select /* set_testing */ @@version");
 	MYSQL_RES *result = mysql_store_result(mysql);
 	MYSQL_ROW row;
 	while ((row = mysql_fetch_row(result)))
diff --git a/test/tap/tests/set_testing.h b/test/tap/tests/set_testing.h
@@ -473,7 +473,7 @@ int detect_version(CommandLine& cl, bool& is_mariadb, bool& is_cluster) {
 		return 1;
 	}
 
-	MYSQL_QUERY(mysql, "select @@version");
+	MYSQL_QUERY(mysql, "select /* set_testing */ @@version");
 	MYSQL_RES *result = mysql_store_result(mysql);
 	MYSQL_ROW row;
 	while ((row = mysql_fetch_row(result)))
diff --git a/test/tap/tests/test_firewall-t.cpp b/test/tap/tests/test_firewall-t.cpp
@@ -58,7 +58,7 @@ int main(int argc, char** argv) {
 	MYSQL_QUERY(mysqladmin, "load mysql variables to runtime");
 	
 	// Test that firewall initialized and blocks all queries
-	if (mysql_query(mysql, "select @@version")) {
+	if (mysql_query(mysql, "select /* set_testing */ @@version")) {
 		int myerrno = mysql_errno(mysql);
 		ok(myerrno == 1148, "Any query should be blocked");
 	}

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ int detect_version(CommandLine& cl, bool& is_mariadb) {`
`474`	`474`	`return 1;`
`475`	`475`	`}`
`476`	`476`
`477`		`- MYSQL_QUERY(mysql, "select @@version");`
	`477`	`+ MYSQL_QUERY(mysql, "select /* set_testing */ @@version");`
`478`	`478`	`MYSQL_RES *result = mysql_store_result(mysql);`
`479`	`479`	`MYSQL_ROW row;`
`480`	`480`	`while ((row = mysql_fetch_row(result)))`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ int detect_version(CommandLine& cl, bool& is_mariadb, bool& is_cluster) {`
`473`	`473`	`return 1;`
`474`	`474`	`}`
`475`	`475`
`476`		`- MYSQL_QUERY(mysql, "select @@version");`
	`476`	`+ MYSQL_QUERY(mysql, "select /* set_testing */ @@version");`
`477`	`477`	`MYSQL_RES *result = mysql_store_result(mysql);`
`478`	`478`	`MYSQL_ROW row;`
`479`	`479`	`while ((row = mysql_fetch_row(result)))`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ int main(int argc, char** argv) {`
`58`	`58`	`MYSQL_QUERY(mysqladmin, "load mysql variables to runtime");`
`59`	`59`
`60`	`60`	`// Test that firewall initialized and blocks all queries`
`61`		`- if (mysql_query(mysql, "select @@version")) {`
	`61`	`+ if (mysql_query(mysql, "select /* set_testing */ @@version")) {`
`62`	`62`	`int myerrno = mysql_errno(mysql);`
`63`	`63`	`ok(myerrno == 1148, "Any query should be blocked");`
`64`	`64`	`}`