Merge pull request #3459 from sysown/v2.x-3458

renecannao · web-flow · commit 5a6095cd1457 · 2021-05-26T14:33:38.000+02:00
Closes #3458: Fix 'conditional jump or move depends on uninitialised value(s)' detected by Valgrind
diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
@@ -212,6 +212,8 @@ Query_Info::Query_Info() {
 	waiting_since = 0;
 	affected_rows=0;
 	rows_sent=0;
+	start_time=0;
+	end_time=0;
 }
 
 Query_Info::~Query_Info() {
diff --git a/test/tap/tests/test_ps_no_store-t.cpp b/test/tap/tests/test_ps_no_store-t.cpp
@@ -34,13 +34,16 @@ int select_config_file(MYSQL* mysql, std::string& resultset) {
 		fprintf(stderr, "error\n");
 	}
 
+	return 0;
 }
 
 int restore_admin(MYSQL* mysqladmin) {
 	MYSQL_QUERY(mysqladmin, "load mysql query rules from disk");
 	MYSQL_QUERY(mysqladmin, "load mysql query rules to runtime");
 	MYSQL_QUERY(mysqladmin, "load mysql servers from disk");
 	MYSQL_QUERY(mysqladmin, "load mysql servers to runtime");
+
+	return 0;
 }
 
 int main(int argc, char** argv) {

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,16 @@ int select_config_file(MYSQL* mysql, std::string& resultset) {`
`34`	`34`	`fprintf(stderr, "error\n");`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ return 0;`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`int restore_admin(MYSQL* mysqladmin) {`
`40`	`41`	`MYSQL_QUERY(mysqladmin, "load mysql query rules from disk");`
`41`	`42`	`MYSQL_QUERY(mysqladmin, "load mysql query rules to runtime");`
`42`	`43`	`MYSQL_QUERY(mysqladmin, "load mysql servers from disk");`
`43`	`44`	`MYSQL_QUERY(mysqladmin, "load mysql servers to runtime");`
	`45`	`+`
	`46`	`+ return 0;`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`int main(int argc, char** argv) {`