SQLyog 12.5 GA

include/CommonHelper.h

@@ -57,7 +57,10 @@
 #define     NCP_UTF16   3
 #define     NCP_ASCII   4
 
-#define		FMT_SPACE_4 "    "    
+#define		FMT_SPACE_4 "    " 
+
+#define		REGKEY			"Use any UUID here"
+
 
 #define		SSHTUNNELER 	  "plink.exe"
 #define     SQLYOG_MUTEX_NAME "SQLyogSSHMutex"
@@ -109,6 +112,15 @@
 #define  MYSQL_TYPE_JSON 245
 #define  FIELD_TYPE_JSON  MYSQL_TYPE_JSON
 
+enum EntType
+{
+	ENT_ULTIMATE	= 1,
+	ENT_NORMAL	= 2,
+	ENT_PRO		= 3,
+	ENT_TRIAL   = 4,
+	ENT_INVALID	= 5
+};
+
 
 typedef struct ForeignKey
 {

include/ConnectionBase.h

@@ -28,9 +28,6 @@ extern	PGLOBALS pGlobals;
 
 #define FIND_STR_LEN	256
 
-//#define		REGKEY			"Software\\{906D6D9F-AB51-429F-8816-8D33284204FF}"
-//#define		REGKEY			"Software\\{BEE2684F-3781-4372-BA18-75ECC22C3B70}"
-#define		REGKEY			"Use Any UUID Here"
 #define		REGAPPID		"InU"
 /* window identifiers for all windows in both the connection dialog tabs */
 /* since we create everything by hand ( and not using the resource eidtor) 
@@ -58,14 +55,6 @@ extern	PGLOBALS pGlobals;
 #define     ALL_QUERY                                      3
 #define     PASTE_QUERY									   4 
 
-enum EntType
-{
-	ENT_ULTIMATE	= 1,
-	ENT_NORMAL	= 2,
-	ENT_PRO		= 3,
-	ENT_TRIAL   = 4,
-	ENT_INVALID	= 5
-};
 
 class ConnectionBase
 {
@@ -113,6 +102,7 @@ class ConnectionBase
 
     /// Status bar original window procedure
 	WNDPROC         m_wpstatusbarorigproc;
+
 
 public:
 

include/Datatype.h

@@ -29,12 +29,12 @@
 #define _DATATYPE_H_
 
 
-
 #ifdef _WIN32
 
     #include <winsock.h>
 	#include <mysql.h>
 #else
+       #include <limits.h>
 	#include <mysql/mysql.h>
 #endif
 

include/ExportMultiFormat.h

@@ -764,6 +764,8 @@ class CExportResultSet
 	*/
 	wyBool		SetStaticText();
 
+	void		FlashIfInactive(HWND hwnd);
+
 	/// Sets the file in the edit box.
 	/**
 	@returns wyTrue on success else wyFalse

include/Version.h

@@ -1,5 +1,5 @@
 #define MAJOR_VERSION_INT		12
 #define MINOR_VERSION_INT		4
-#define UPDATE_VERSION_INT		2
+#define UPDATE_VERSION_INT		3
 #define RELEASE_VERSION_INT		0        
 #define EXTRAINFO				""

include/wyString.h

@@ -132,6 +132,7 @@ class wyString
     @returns Length of the buffer.
     */
 	wyUInt32 SetAs(const wyWChar* toset);
+	wyUInt32 SetAs(const wyWChar* toset, wyInt32 length);
 
     /// Sets a specific length of data to the string passed as parameter
     /**
@@ -474,6 +475,8 @@ class wyString
 	@param isreverse	: if its wyTrue then reverse the main string and search string and do search
 	*/
 	wyInt32				FindIWithReverse(wyChar *searchstr, wyUInt32 pos, wyBool isreverse = wyFalse);
+
+	void JsonEscape();
 
 private:
 
@@ -555,6 +558,8 @@ class wyString
 	} */   
 
     wyString(const wyString &str);
+
+
 };
 
 #endif

localization/Strings/String/en/file25.xml

@@ -26,31 +26,4 @@
 	<string name="3652">Import &amp;XML Data Using LOAD LOCAL...	Ctrl+Shift+X</string>
 	<string name="3653">Select Table and Columns To Import In XML</string>
 	<string name="3654">Rows Identified by</string>
-	<string name="3655">Replace</string>
-	<string name="3656">T&amp;ransactions</string>
-	<string name="3657">Set Autocommit</string>
-	<string name="3658">Isolation Level</string>
-	<string name="3659">Start Transaction</string>
-	<string name="3660">Commit</string>
-	<string name="3661">Rollback</string>
-	<string name="3662">Savepoint</string>
-	<string name="3663">Repeatable Read</string>
-	<string name="3664">Read Committed</string>
-	<string name="3665">Read Uncommitted</string>
-	<string name="3666">Serializable</string>
-	<string name="3667">With no modifier</string>
-	<string name="3668">With Consistent Snapshot</string>
-	<string name="3669">Read only</string>
-	<string name="3670">Read Write</string>
-	<string name="3671">And Chain</string>
-	<string name="3672">And No Chain</string>
-	<string name="3673">Release</string>
-	<string name="3674">No Release</string>
-	<string name="3675">To Savepoint</string>
-	<string name="3676">Transaction</string>
-	<string name="3677">Create Savepoint</string>
-	<string name="3678">Release Savepoint</string>
-	<string name="3679">Commit Transaction</string>
-	<string name="3680">Rollback Transaction</string>
-
 </resources>

localization/Strings/String/en/file26.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="3656">T&amp;ransactions</string>
+	<string name="3657">Set Autocommit</string>
+	<string name="3658">Isolation Level</string>
+	<string name="3659">Start Transaction</string>
+	<string name="3660">Commit</string>
+	<string name="3661">Rollback</string>
+	<string name="3662">Savepoint</string>
+	<string name="3663">Repeatable Read</string>
+	<string name="3664">Read Committed</string>
+	<string name="3665">Read Uncommitted</string>
+	<string name="3666">Serializable</string>
+	<string name="3667">With no modifier</string>
+	<string name="3668">With Consistent Snapshot</string>
+	<string name="3669">Read only</string>
+	<string name="3670">Read Write</string>
+	<string name="3671">And Chain</string>
+	<string name="3672">And No Chain</string>
+	<string name="3673">Release</string>
+	<string name="3674">No Release</string>
+	<string name="3675">To Savepoint</string>
+	<string name="3676">Transaction</string>
+	<string name="3677">Create Savepoint</string>
+	<string name="3678">Release Savepoint</string>
+	<string name="3679">Commit Transaction</string>
+	<string name="3680">Rollback Transaction</string>
+
+</resources>

localization/Strings/String/en/file5.xml

@@ -191,7 +191,6 @@ Note: To create a job use the respective job wizards</string>
 	<string name="2146">Error handling</string>
 	<string name="2147">1</string>
 	<string name="2148">Completing the Database Import Wizard</string>
-	<string name="2149">Specify Job File:</string>
 	<string name="2150">Specify Schedule Name:</string>
 	<string name="2151">DDL/DML Options</string>
 	<string name="2152">Import Options</string>

localization/Strings/String/en/shortcuts.xml

@@ -2,8 +2,6 @@
 
 <resources>
 
-	<string name="100">Connection</string>
-
 	<string name="101">Create A New Connection</string>
 
 	<string name="102">Create A New Connection With Current Connection Properties</string>

localization/Strings/String/ja/file25.xml

@@ -26,30 +26,4 @@
 	<string name="3652">ロード・ローカルを使って&amp;XMLデータをインポート中... 	Ctrl+Shift+X</string>
 	<string name="3653">テーブルとコラムを選択してXMLにインポートしてください。</string>
 	<string name="3654">～によって判別される行</string>
-	<string name="3655">置換</string>
-	<string name="3656">&amp;取引</string>
-	<string name="3657">自動コミットを設定します。</string>
-	<string name="3658">分離レベル</string>
-	<string name="3659">トランザクション開始</string>
-	<string name="3660">コミット</string>
-	<string name="3661">ロールバック</string>
-	<string name="3662">セーブポイント</string>
-	<string name="3663">反復可能読み取り</string>
-	<string name="3664">コミット読みます</string>
-	<string name="3665">非コミット読み取り</string>
-	<string name="3666">直列化可能</string>
-	<string name="3667">無修飾剤</string>
-	<string name="3668">一貫性のあるスナップショットと</string>
-	<string name="3669">読み取り専用</string>
-	<string name="3670">読み書き</string>
-	<string name="3671">そしてチェーン</string>
-	<string name="3672">そしてませチェーンはありません</string>
-	<string name="3673">リリース</string>
-	<string name="3674">いいえリリースはありません</string>
-	<string name="3675">セーブポイントへ</string>
-	<string name="3676">トランザクション</string>
-	<string name="3677">セーブポイントを作成します。</string>
-	<string name="3678">リリースセーブポイント</string>
-	<string name="3679">トランザクションのコミット</string>
-	<string name="3680">ロールバックトランザクション</string>
 </resources>

localization/Strings/String/ja/file26.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="3656">&amp;取引</string>
+	<string name="3657">自動コミットを設定します。</string>
+	<string name="3658">分離レベル</string>
+	<string name="3659">トランザクション開始</string>
+	<string name="3660">コミット</string>
+	<string name="3661">ロールバック</string>
+	<string name="3662">セーブポイント</string>
+	<string name="3663">反復可能読み取り</string>
+	<string name="3664">コミット読みます</string>
+	<string name="3665">非コミット読み取り</string>
+	<string name="3666">直列化可能</string>
+	<string name="3667">無修飾剤</string>
+	<string name="3668">一貫性のあるスナップショットと</string>
+	<string name="3669">読み取り専用</string>
+	<string name="3670">読み書き</string>
+	<string name="3671">そしてチェーン</string>
+	<string name="3672">そしてませチェーンはありません</string>
+	<string name="3673">リリース</string>
+	<string name="3674">いいえリリースはありません</string>
+	<string name="3675">セーブポイントへ</string>
+	<string name="3676">トランザクション</string>
+	<string name="3677">セーブポイントを作成します。</string>
+	<string name="3678">リリースセーブポイント</string>
+	<string name="3679">トランザクションのコミット</string>
+	<string name="3680">ロールバックトランザクション</string>
+
+</resources>

localization/Strings/String/ja/file5.xml

@@ -191,7 +191,6 @@
 	<string name="2146">エラーの扱い</string>
 	<string name="2147">1</string>
 	<string name="2148">データーベース読み込みウイザードを完了中</string>
-	<string name="2149">ジョブファイルを指定：</string>
 	<string name="2150">スケジュール名を指定：</string>
 	<string name="2151">DDL/DML オプション</string>
 	<string name="2152">読み込みオプション</string>

localization/Strings/String/ja/shortcuts.xml

@@ -2,8 +2,6 @@
 
 <resources>
 
-	<string name="100">接続</string>
-
 	<string name="101">新しい接続を作成</string>
 
 	<string name="102">現在の接続のプロパティで新しい接続を作成</string>

localization/Strings/String/ko/file1.xml

@@ -41,7 +41,7 @@
 	<string name="1036">이 접속 상세를 정말 삭제하시겠습니까?</string>
 	<string name="1037">접속 성공!
 MySQL 버전: %s</string>
-	<<string name="1038">접속 정보</string>
+	<string name="1038">접속 정보</string>
  	<string name="1039">새로운 창을 초기화하지 못했습니다</string>
  	<string name="1040">이 기능은 HTTP 터널을 이용하여 접속할 경우에만 가능합니다.</string>
 	<string name="1041">복구(&amp;R)</string>

localization/Strings/String/ko/file25.xml

@@ -26,31 +26,4 @@
 	<string name="3652">LOAD LOCAL을 통해 &amp;XML 데이터 가져오기...	Ctrl+Shift+X</string>
 	<string name="3653">XML을 불러오기 위해 테이블과 칼럼을 선택</string>
 	<string name="3654">다음에 의해 식별된 열:</string>
-	<string name="3655">바꾸기</string>
-	<string name="3656">&amp;업무</string>
-	<string name="3657">자동 커밋 설정</string>
-	<string name="3658">격리 수준</string>
-	<string name="3659">시작 트랜잭션</string>
-	<string name="3660">범하다</string>
-	<string name="3661">롤백</string>
-	<string name="3662">세이브 포인트</string>
-	<string name="3663">반복 읽기</string>
-	<string name="3664">커밋 된 읽기</string>
-	<string name="3665">커밋되지 않은 읽기</string>
-	<string name="3666">직렬화</string>
-	<string name="3667">없는 수정과</string>
-	<string name="3668">일관된 스냅 샷으로</string>
-	<string name="3669">읽기 전용</string>
-	<string name="3670">읽기 쓰기</string>
-	<string name="3671">그리고 체인</string>
-	<string name="3672">그리고 어떤 체인 없음</string>
-	<string name="3673">해제</string>
-	<string name="3674">어떤 자료 없음</string>
-	<string name="3675">세이브 포인트하려면</string>
-	<string name="3676">트랜잭션</string>
-	<string name="3677">세이브 포인트를 만들기</string>
-	<string name="3678">릴리스 세이브 포인트</string>
-	<string name="3679">트랜잭션을 커밋</string>
-	<string name="3680">롤백 트랜잭션</string>
-
-</resources>
+	</resources>

localization/Strings/String/ko/file26.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="3656">&amp;업무</string>
+	<string name="3657">자동 커밋 설정</string>
+	<string name="3658">격리 수준</string>
+	<string name="3659">시작 트랜잭션</string>
+	<string name="3660">범하다</string>
+	<string name="3661">롤백</string>
+	<string name="3662">세이브 포인트</string>
+	<string name="3663">반복 읽기</string>
+	<string name="3664">커밋 된 읽기</string>
+	<string name="3665">커밋되지 않은 읽기</string>
+	<string name="3666">직렬화</string>
+	<string name="3667">없는 수정과</string>
+	<string name="3668">일관된 스냅 샷으로</string>
+	<string name="3669">읽기 전용</string>
+	<string name="3670">읽기 쓰기</string>
+	<string name="3671">그리고 체인</string>
+	<string name="3672">그리고 어떤 체인 없음</string>
+	<string name="3673">해제</string>
+	<string name="3674">어떤 자료 없음</string>
+	<string name="3675">세이브 포인트하려면</string>
+	<string name="3676">트랜잭션</string>
+	<string name="3677">세이브 포인트를 만들기</string>
+	<string name="3678">릴리스 세이브 포인트</string>
+	<string name="3679">트랜잭션을 커밋</string>
+	<string name="3680">롤백 트랜잭션</string>
+
+</resources>

localization/Strings/String/ko/file5.xml

@@ -191,7 +191,6 @@
 	<string name="2146">오류 핸들링</string>
 	<string name="2147">1</string>
 	<string name="2148">데이터베이스 불러오기 마법사 완료 중</string>
-	<string name="2149">작업 파일 지정하기:</string>
 	<string name="2150">스케쥴 이름 지정하기:</string>
 	<string name="2151">DDL/DML 옵션</string>
 	<string name="2152">옵션 불러오기</string>

localization/Strings/String/ko/shortcuts.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="100">연결</string>
 	<string name="101">새 연결 구성하기</string>
 	<string name="102">최근 연결 속성으로 새 연결 구성하기</string>
 	<string name="103">현재 연결 끊기</string>