Fix incorrect evaluation of ASYNC_PING_TIMEOUT for #542

renecannao · renecannao · commit 3899356d1ae1 · 2016-04-28T01:00:46.000Z
diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp
@@ -512,9 +512,9 @@ MDB_ASYNC_ST MySQL_Connection::handler(short event) {
 			}
 			if (async_exit_status) {
 				if (myds->sess->thread->curtime >= myds->wait_until) {
-					next_event(ASYNC_PING_CONT);
-				} else {
 					NEXT_IMMEDIATE(ASYNC_PING_TIMEOUT);
+				} else {
+					next_event(ASYNC_PING_CONT);
 				}
 			} else {
 				NEXT_IMMEDIATE(ASYNC_PING_END);

Original file line number	Diff line number	Diff line change
`@@ -512,9 +512,9 @@ MDB_ASYNC_ST MySQL_Connection::handler(short event) {`
`512`	`512`	`}`
`513`	`513`	`if (async_exit_status) {`
`514`	`514`	`if (myds->sess->thread->curtime >= myds->wait_until) {`
`515`		`- next_event(ASYNC_PING_CONT);`
`516`		`- } else {`
`517`	`515`	`NEXT_IMMEDIATE(ASYNC_PING_TIMEOUT);`
	`516`	`+ } else {`
	`517`	`+ next_event(ASYNC_PING_CONT);`
`518`	`518`	`}`
`519`	`519`	`} else {`
`520`	`520`	`NEXT_IMMEDIATE(ASYNC_PING_END);`