From 12232de5bbd95651e75bf8a39cba8889dc63a9cf Mon Sep 17 00:00:00 2001
From: wydeep <deep.shikha@idera.com>
Date: Fri, 19 Jul 2019 04:31:57 -0700
Subject: [PATCH] SQLyog 13.1.5 GA

---
 include/CommonHelper.h     | 2 +-
 include/Version.h          | 2 +-
 src/ClientMySQLWrapper.cpp | 4 +++-
 src/CommonHelper.cpp       | 4 ++--
 src/FrameWindowHelper.cpp  | 5 ++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/CommonHelper.h b/include/CommonHelper.h
index a4082d9..d0eaf7b 100644
--- a/include/CommonHelper.h
+++ b/include/CommonHelper.h
@@ -59,7 +59,7 @@
 
 #define		FMT_SPACE_4 "    " 
 
-#define		REGKEY			"xxx" //Provide any UUID here
+#define		REGKEY			"Provide any UUID here"
 
 
 #define		SSHTUNNELER 	  "plink.exe"
diff --git a/include/Version.h b/include/Version.h
index b1f5ed7..462e54b 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -1,5 +1,5 @@
 #define MAJOR_VERSION_INT		13
 #define MINOR_VERSION_INT		1
-#define UPDATE_VERSION_INT		4
+#define UPDATE_VERSION_INT		5
 #define RELEASE_VERSION_INT		0            
 #define EXTRAINFO				" "
diff --git a/src/ClientMySQLWrapper.cpp b/src/ClientMySQLWrapper.cpp
index 9288bef..eafc6ac 100644
--- a/src/ClientMySQLWrapper.cpp
+++ b/src/ClientMySQLWrapper.cpp
@@ -45,6 +45,7 @@
 #define	LOST_CONNECTION_ERROR	2013
 #define	NO_DB_SELECTED			1046
 #define	MYSQL_CONNECT_ERROR		2003
+#define	CR_CONNECTION_ERROR		2002
 
 /* function checks whether there a unprintable character in between */
 /* this function is required for tunneling as we need to send the data in base 64 encoding */
@@ -323,7 +324,8 @@ MYSQL_RES* SjaExecuteAndGetResult(Tunnel *tunnel, PMYSQL mysql, wyString &query,
 	if(!tunnel->IsTunnel() && ret &&
 		((tunnel->mysql_errno(*mysql)== MYSQL_CONNECT_ERROR) || 
 		 (tunnel->mysql_errno(*mysql)== MYSQL_SERVER_GONE) ||
-		  tunnel->mysql_errno(*mysql) == LOST_CONNECTION_ERROR))
+		  tunnel->mysql_errno(*mysql) == LOST_CONNECTION_ERROR) ||
+		tunnel->mysql_errno(*mysql) == CR_CONNECTION_ERROR)
 	{	
 		if(HandleReconnect(tunnel, mysql, coninfo, usedbname) == true)
 			ret  = HandleSjaMySQLRealQuery(tunnel, *mysql, query.GetString(), query.GetLength(), isbatch, (bool*)stop);
diff --git a/src/CommonHelper.cpp b/src/CommonHelper.cpp
index 875ab0d..2358206 100644
--- a/src/CommonHelper.cpp
+++ b/src/CommonHelper.cpp
@@ -75,8 +75,8 @@ extern	FILE	*logfilehandle;
 static wyChar table64[]=
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-static CryptoPP::byte AESKey[16] = { };// Type any key
-static CryptoPP::byte AESiv[16] = { };//Type any IV
+static CryptoPP::byte AESKey[16] = { };//provide any Key
+static CryptoPP::byte AESiv[16] = {}; //Provide any IV
 
 Tunnel * 
 CreateTunnel(wyBool istunnel)
diff --git a/src/FrameWindowHelper.cpp b/src/FrameWindowHelper.cpp
index cfc85d5..d015b56 100644
--- a/src/FrameWindowHelper.cpp
+++ b/src/FrameWindowHelper.cpp
@@ -45,6 +45,8 @@
 #define			MYSQL_SERVER_GONE		2006
 #define			NO_DB_SELECTED			1046
 #define			MYSQL_CONNECT_ERROR		2003
+#define			CR_CONNECTION_ERROR		2002
+
 
 #define			MAX_QUERY_SIZE			(1024*4)
 #define			ZERO					0
@@ -153,7 +155,8 @@ wyInt32 my_query(MDIWindow *wnd, Tunnel * tunnel, PMYSQL mysql, const wyChar *qu
 			ret &&((tunnel->mysql_errno(*mysql)== MYSQL_CONNECT_ERROR) ||
 			(tunnel->mysql_errno(*mysql)== NO_DB_SELECTED) ||
 			(tunnel->mysql_errno(*mysql)== MYSQL_SERVER_GONE) ||
-             tunnel->mysql_errno(*mysql) == LOST_CONNECTION_ERROR)&& querycount == 0 && (!stop || !(*stop)))
+             tunnel->mysql_errno(*mysql) == LOST_CONNECTION_ERROR ||
+				tunnel->mysql_errno(*mysql) == CR_CONNECTION_ERROR)&& querycount == 0 && (!stop || !(*stop)))
 		{	
 			wnd->m_isreconnected = wyFalse; 
 			if(wnd->ReConnect(tunnel, mysql, wnd->m_conninfo.m_isssh, isimport, profile) == wyTrue)