From 3899356d1ae1e9c93718e91a5f8ebcebc20a76bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= <rene.cannao@gmail.com>
Date: Thu, 28 Apr 2016 01:00:46 +0000
Subject: [PATCH] Fix incorrect evaluation of ASYNC_PING_TIMEOUT for #542

---
 lib/mysql_connection.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp
index f7f9c00bb8..fc829fb9c2 100644
--- 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);