From 71aab67bc3b4315e3639a747b1485a974a61748e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= <rene.cannao@gmail.com>
Date: Thu, 16 Jul 2015 21:09:00 +0000
Subject: [PATCH] Reneabled sessions without frontend, it needs more clean up
 first

---
 lib/MySQL_Session.cpp | 17 +++++------------
 lib/MySQL_Thread.cpp  |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
index 6ab97f9ab..54b4c6d5f 100644
--- a/lib/MySQL_Session.cpp
+++ b/lib/MySQL_Session.cpp
@@ -195,26 +195,18 @@ int MySQL_Session::handler() {
 	unsigned int j;
 	unsigned char c;
 
+//	FIXME: Sessions without frontend are an ugly hack
 	if (session_fast_forward==false) {
 	if (client_myds==NULL) {
 		// if we are here, probably we are trying to ping backends
 		proxy_debug(PROXY_DEBUG_MYSQL_CONNECTION, 5, "Processing session %p without client_myds\n", this);
 		assert(mybe);
 		assert(mybe->server_myds);
-//		if (mybe->server_myds->DSS==STATE_PING_SENT_NET) {
-//			assert(mybe->server_myds->myconn);
-//			proxy_debug(PROXY_DEBUG_MYSQL_CONNECTION, 5, "Processing session %p without client_myds . server_myds=%p , myconn=%p , fd=%d , timeout=%llu , curtime=%llu\n", this, mybe->server_myds , mybe->server_myds->myconn, mybe->server_myds->myconn->fd , mybe->server_myds->timeout , thread->curtime);
-//			if (mybe->server_myds->timeout < thread->curtime) {
-//				MyHGM->destroy_MyConn_from_pool(mybe->server_myds->myconn);
-//				mybe->server_myds->myconn=NULL;
-//				mybe->server_myds->fd=-1;
-//				thread->mypolls.remove_index_fast(mybe->server_myds->poll_fds_idx);
-//				return -1;
-//			}
-//		}
 		goto __exit_DSS__STATE_NOT_INITIALIZED;
 	}
 	}
+
+
 	for (j=0; j<client_myds->PSarrayIN->len;) {
 		client_myds->PSarrayIN->remove_index(0,&pkt);
 		//prot.parse_mysql_pkt(&pkt,client_myds);
@@ -360,7 +352,8 @@ int MySQL_Session::handler() {
 				break;
 			case NONE:
 			default:
-				assert(0);
+				proxy_error("Unexpected packet from client, disconnecting the client\n");
+				return -1;
 				break;
 		}
 	}
diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
index d14e1eeaa..b7e848ae8 100644
--- a/lib/MySQL_Thread.cpp
+++ b/lib/MySQL_Thread.cpp
@@ -1112,7 +1112,7 @@ void MySQL_Thread::process_data_on_data_stream(MySQL_Data_Stream *myds, unsigned
 				mypolls.last_recv[n]=curtime;
 				myds->revents=mypolls.fds[n].revents;
 				myds->sess->to_process=1;
-				if (myds->myds_type==MYDS_BACKEND && myds->sess->fast_forward==false) {
+				if (myds->myds_type==MYDS_BACKEND && myds->sess->status!=FAST_FORWARD) {
 					return;
 				}
 				if (mypolls.myds[n]->DSS < STATE_MARIADB_BEGIN || mypolls.myds[n]->DSS > STATE_MARIADB_END) {