Fix incorrect evaluation of ASYNC_PING_TIMEOUT for #542

sysown · Apr 28, 2016 · 3899356 · 3899356
1 parent bc7e4c6
commit 3899356
Showing 1 changed file with 2 additions and 2 deletions.
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);