diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
index f3dc10261..60bcce5a3 100644
--- a/lib/MySQL_Session.cpp
+++ b/lib/MySQL_Session.cpp
@@ -705,7 +705,8 @@ handler_again:
 						if (mybe->server_myds->wait_until==0) {
 							mybe->server_myds->wait_until=thread->curtime;
 						}
-						mybe->server_myds->wait_until+=mysql_thread___default_query_timeout*1000;
+						unsigned long long def_query_timeout=mysql_thread___default_query_timeout;
+						mybe->server_myds->wait_until+=def_query_timeout*1000;
 					}
 				}
 				int rc=myconn->async_query(myds->revents, myds->mysql_real_query.ptr,myds->mysql_real_query.size);
diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp
index e32c6e505..59e844e5c 100644
--- a/lib/mysql_connection.cpp
+++ b/lib/mysql_connection.cpp
@@ -364,7 +364,7 @@ handler_again:
 			}
 			break;
 		case ASYNC_CONNECT_CONT:
-			it (event) {
+			if (event) {
 				connect_cont(event);
 			}
 			if (async_exit_status) {