diff --git a/include/CalendarCtrl.h b/include/CalendarCtrl.h
index 2f32a86..b83d435 100644
--- a/include/CalendarCtrl.h
+++ b/include/CalendarCtrl.h
@@ -137,6 +137,9 @@ class CalendarCtrl
//Handles click of the OK button
void OnClickOk();
+ //Handles click of the OK button
+ void OnClickNow();
+
//Handles click of the Cancel button
void OnClickCancel();
diff --git a/include/FrameWindowHelper.h b/include/FrameWindowHelper.h
index ba8f974..0c1f482 100644
--- a/include/FrameWindowHelper.h
+++ b/include/FrameWindowHelper.h
@@ -392,19 +392,19 @@ All Files(*.*)\0*.*\0"
#define DEFAULT_NO_TABLE _("(Read Only)")
#define DEFAULT_NO_TABLEW _(L"(Read Only)")
#define DEFAULT_READONLY_RESULT _(L"Read-only result")
-#define BUYURL "http://www.webyog.com/shop"
-#define BUYURL_POWERTOOLS "http://www.webyog.com/shop/?ref=community.powertools"
-////#define BUYURL_NAGBEGIN "http://www.webyog.com/shop/?ref=community.nagbegin"
-#define BUYURL_TOOLBARRIBBON "http://www.webyog.com/shop/?ref=community.toolbarribbon"
-#define BUYURL_NAGEND "http://www.webyog.com/shop/?ref=community.nagend"
+#define BUYURL "http://www.webyog.com/product/sqlyogpricing"
+#define BUYURL_POWERTOOLS "http://www.webyog.com/product/sqlyogpricing/?ref=community.powertools"
+////#define BUYURL_NAGBEGIN "http://www.webyog.com/product/sqlyogpricing/?ref=community.nagbegin"
+#define BUYURL_TOOLBARRIBBON "http://www.webyog.com/product/sqlyogpricing/?ref=community.toolbarribbon"
+#define BUYURL_NAGEND "http://www.webyog.com/product/sqlyogpricing/?ref=community.nagend"
#define HOMEURL_ABOUTUS "http://www.webyog.com/?ref=community.aboutus"
-#define BUYURL_STATUSBAR "http://www.webyog.com/shop/?ref=community.statusbar"
+#define BUYURL_STATUSBAR "http://www.webyog.com/product/sqlyogpricing/?ref=community.statusbar"
#define HOMEURL_UPGRADECHECK "http://www.webyog.com/?ref=community.upgradecheck"
-////#define BUYURL_BUYNAGBEGIN "http://www.webyog.com/shop/?ref=community.buynagbegin"
-#define BUYURL_BUYNAGEND "http://www.webyog.com/shop/?ref=community.buynagend"
-#define SUPPORTURL "https://www.webyog.com/customer"
+////#define BUYURL_BUYNAGBEGIN "http://www.webyog.com/product/sqlyogpricing/?ref=community.buynagbegin"
+#define BUYURL_BUYNAGEND "http://www.webyog.com/product/sqlyogpricing/?ref=community.buynagend"
+#define SUPPORTURL "https://www.webyog.com/customer?ref=sqlyog"
-#define BUYENT "http://www.webyog.com/shop"
+#define BUYENT "http://www.webyog.com/product/sqlyogpricing"
#define IMAGEURL "http://www.webyog.com"
#define PRODUCTURL "https://www.webyog.com/product/sqlyog"
#define COMMUNITYURL "https://www.webyog.com/community"
@@ -1237,6 +1237,10 @@ wyInt32 SetListBoxWidth(HWND hwndlist);
wyBool IsShowWarnings();
+///Halt Query Execution on Errors
+wyBool IsHaltExecutionOnError();
+
+
/// Helper function to write the database information to xml file
/**
@param hfile : IN handle to the file
diff --git a/include/MySQLVersionHelper.h b/include/MySQLVersionHelper.h
index 7be6f7a..ea9ca72 100644
--- a/include/MySQLVersionHelper.h
+++ b/include/MySQLVersionHelper.h
@@ -147,6 +147,8 @@ wyBool IsMariaDB52(Tunnel * tunnel, PMYSQL mysql);
//MySQL 5.7.0 for Virtual/Stored columns
wyBool IsMySQL57(Tunnel * tunnel, PMYSQL mysql);
+//MySQL 5.7.7 for SYS Schema
+wyBool IsMySQL577(Tunnel * tunnel, PMYSQL mysql);
/// Checks the server version is greater than or equal to mySQL5.0.2
/**
@param tunnel: IN tunnel pointer
diff --git a/include/QueryAnalyzerBase.h b/include/QueryAnalyzerBase.h
index 6e3f909..71d5780 100644
--- a/include/QueryAnalyzerBase.h
+++ b/include/QueryAnalyzerBase.h
@@ -29,7 +29,7 @@
#define QA_ULTIMATE _("Query Profiler is available only in Ultimate version of SQLyog.\
\
-Click here to buy SQLyog Ultimate\
+Click here to buy SQLyog Ultimate\
\
Query Profiler Features:\
\
diff --git a/include/SQLyog.rc b/include/SQLyog.rc
index 8c4a2e6..887cc0a 100644
--- a/include/SQLyog.rc
+++ b/include/SQLyog.rc
@@ -1795,21 +1795,23 @@ CAPTION "General"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "Generate &queries using backquote(`)",IDC_BACKQUOTES,
- "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,4,3,202,10
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,4,5,202,10
CONTROL "Keep &focus on SQL editor after query execution",IDC_FOCUSAFTERQUERY,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,16,205,10
CONTROL "P&rompt if a tab with unsaved changes is closed",IDC_CONFIRMONTABCLOSE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,29,202,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,27,202,10
CONTROL "Paste object name in &editor on double-click",IDC_GETTEXTONDBCLICK,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,202,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,38,202,10
CONTROL "Enable &word wrap in SQL editor and BLOB viewer",IDC_WORDWRAP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,55,202,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,49,202,10
CONTROL "Enable transaction support for &batch process",IDC_TRANSACTIONENABLE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,68,202,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,60,202,10
CONTROL "Force disable F&K check throughout HTTP import batch process",IDC_FKCHKIMPORT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,81,225,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,71,225,10
CONTROL "&Show Warning(s) in Messages tab",IDC_SHOWWARNING,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,94,124,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,82,124,10
+ CONTROL "Halt Execution of Queries on Error",IDC_HALTEXEC,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,93,124,10
GROUPBOX "Export Options ",IDC_STATIC,4,106,247,99
GROUPBOX "Max. size (in KB) for BULK INSERT statement(s)",IDC_STATIC,9,116,237,40
CONTROL "&Get server default",IDC_DEF_BULK_SIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,127,112,8
@@ -2056,9 +2058,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_BORDER
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "",IDC_MONTHCALENDAR1,"SysMonthCal32",MCS_NOTODAY | WS_TABSTOP,0,0,116,88
- DEFPUSHBUTTON "OK",IDOK,54,88,30,15
- PUSHBUTTON "Cancel",IDCANCEL,83,88,30,15
- CONTROL "",IDC_DATETIMEPICKER1,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,0,88,54,15
+ PUSHBUTTON "Cancel",IDCANCEL,85,88,29,14
+ CONTROL "",IDC_DATETIMEPICKER1,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP | 0x8,0,88,40,14
+ DEFPUSHBUTTON "OK",IDOK,64,88,20,15
+ PUSHBUTTON "NOW",IDCURRDATE,42,88,21,15
END
IDD_SEARCHFILTER DIALOGEX 0, 0, 270, 241
diff --git a/include/Version.h b/include/Version.h
index 2ed9e88..8a96c9d 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -1,5 +1,5 @@
#define MAJOR_VERSION_INT 12
#define MINOR_VERSION_INT 2
-#define UPDATE_VERSION_INT 1
+#define UPDATE_VERSION_INT 2
#define RELEASE_VERSION_INT 0
#define EXTRAINFO ""
diff --git a/include/resource.h b/include/resource.h
index a76edde..d9e3677 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -8,6 +8,7 @@
#define IDC_ADD 3
#define IDC_UP 4
#define IDC_MOVEDOWN 4
+#define IDCURRDATE 5
#define ID_SELECTALL 6
#define IDC_DOWN 6
#define IDC_UNSELALL2 10
@@ -766,7 +767,8 @@
#define IDC_COMPRESSHELP 1533
#define IDC_TIMEOUTHELP 1534
#define IDC_TIMESEC 1535
-#define IDC_SHOWWARNING 1539
+#define IDC_SHOWWARNING 1536
+#define IDC_HALTEXEC 1539
#define IDC_GETULT 1540
#define IDC_ENTFEATURE 1541
#define IDC_GETENTTEXT 1542
diff --git a/src/CalendarCtrl.cpp b/src/CalendarCtrl.cpp
index b132e66..6195d62 100644
--- a/src/CalendarCtrl.cpp
+++ b/src/CalendarCtrl.cpp
@@ -191,6 +191,10 @@ CalendarCtrl::CalendarCtrlProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lP
case WM_COMMAND:
switch(LOWORD(wParam))
{
+ case IDCURRDATE:
+ pcc->OnClickNow();
+ break;
+
case IDOK:
pcc->OnClickOk();
break;
@@ -367,7 +371,7 @@ CalendarCtrl::PositionWindow(RECT* rect)
RECT temprect = {0};
RECT prect = {0} ;
wyInt32 width, height, hmargin = 0, vmargin = 0;
- RECT calrect,timerect,okrect,cancelrect;
+ RECT calrect,timerect,okrect,cancelrect,nowrect;
GetClientRect(m_hwndparent, &prect);
prect.right = prect.right - prect.left;
prect.bottom = prect.bottom - prect.top;
@@ -379,6 +383,7 @@ CalendarCtrl::PositionWindow(RECT* rect)
MonthCal_GetMinReqRect(GetDlgItem(m_hwnd,IDC_MONTHCALENDAR1),&calrect);
GetWindowRect(GetDlgItem(m_hwnd,IDC_DATETIMEPICKER1),&timerect);
GetWindowRect(GetDlgItem(m_hwnd,IDOK),&okrect);
+ GetWindowRect(GetDlgItem(m_hwnd,IDCURRDATE),&nowrect);
GetWindowRect(GetDlgItem(m_hwnd,IDCANCEL),&cancelrect);
//calculate and modify the width and height based on the availabe space to best fit the window
@@ -394,9 +399,14 @@ CalendarCtrl::PositionWindow(RECT* rect)
{
temprect.top = rect->bottom - height;
}
+ else if(rect->bottom + height/2 <= prect.bottom && rect->bottom - height/2 >= prect.top)
+ {
+ temprect.top = rect->bottom - height/2;
+ }
+
else
{
- temprect.top = rect->top;
+ temprect.top = prect.top;
}
}
else
@@ -450,21 +460,28 @@ CalendarCtrl::PositionWindow(RECT* rect)
MoveWindow(GetDlgItem(m_hwnd,IDC_DATETIMEPICKER1),
0,
(calrect.bottom - calrect.top)-1,
- width - (2*(okrect.right-okrect.left)),
+ width - (3*(okrect.right-okrect.left)+10),
+ okrect.bottom-okrect.top+1,
+ TRUE);
+
+ MoveWindow(GetDlgItem(m_hwnd,IDCURRDATE),
+ width - (3*(okrect.right-okrect.left)+10),
+ (calrect.bottom - calrect.top)-2,
+ (okrect.right-okrect.left)+1,
okrect.bottom-okrect.top+1,
TRUE);
MoveWindow(GetDlgItem(m_hwnd,IDOK),
- width - (2*(okrect.right-okrect.left)),
+ width - (2*(okrect.right-okrect.left)+10),
(calrect.bottom - calrect.top)-2,
(okrect.right-okrect.left),
okrect.bottom-okrect.top+1,
TRUE);
MoveWindow(GetDlgItem(m_hwnd,IDCANCEL),
- width - (okrect.right-okrect.left)-1,
+ width - (okrect.right-okrect.left)-10,
(calrect.bottom - calrect.top)-2,
- (okrect.right-okrect.left),
+ (okrect.right-okrect.left)+9,
okrect.bottom-okrect.top+1,
TRUE);
@@ -484,6 +501,7 @@ CalendarCtrl::OnClickOk()
{
wyInt32 row, col;
+
ConvertCtrlValues();
SendMessage(m_hwnd,UM_ENDDIALOG,0,0);
CustomGrid_ApplyChanges(m_hwndparent);
@@ -498,6 +516,21 @@ CalendarCtrl::OnClickOk()
}
+// handle NOW Click
+void
+CalendarCtrl::OnClickNow()
+{
+ wyInt32 row, col;
+ wyString temp;
+ SYSTEMTIME seltime;
+ GetLocalTime(&seltime);
+ MonthCal_SetCurSel(GetDlgItem(m_hwnd,IDC_MONTHCALENDAR1), &seltime);
+ DateTime_SetFormat(GetDlgItem(m_hwnd,IDC_DATETIMEPICKER1), L"HH:mm:ss");
+ DateTime_SetSystemtime(GetDlgItem(m_hwnd,IDC_DATETIMEPICKER1),GDT_VALID, &seltime);
+
+}
+
+
// handle Cancel Click
void
CalendarCtrl::OnClickCancel()
diff --git a/src/ExportAsSQL.cpp b/src/ExportAsSQL.cpp
index 2ec6ee7..dab3a9e 100644
--- a/src/ExportAsSQL.cpp
+++ b/src/ExportAsSQL.cpp
@@ -2008,6 +2008,7 @@ MySQLDump::DumpAllDatabases(wyString * buffer)
wyBool success;
wyBool ismysql41 = IsMySQL41(m_tunnel, &m_mysql);
wyBool ismysql553 = IsMySQL553(m_tunnel, &m_mysql);
+ wyBool ismysql577 = IsMySQL577(m_tunnel, &m_mysql);
wyInt32 err = 0;
if(m_charset.CompareI("utf8") == 0)
@@ -2072,7 +2073,7 @@ MySQLDump::DumpAllDatabases(wyString * buffer)
continue;
}
}
- else if(stricmp(row[0], "PERFORMANCE_SCHEMA") == 0) //INFORMATION_SCHEMA is not exported
+ else if(stricmp(row[0], "PERFORMANCE_SCHEMA") == 0) //PERFORMANCE_SCHEMA is not exported
{
if(ismysql553 == wyTrue)
{
@@ -2080,7 +2081,14 @@ MySQLDump::DumpAllDatabases(wyString * buffer)
continue;
}
}
-
+ else if(stricmp(row[0], "SYS") == 0) //SYS SCHEMA is not exported for Mysql 5.7.7 and higher version
+ {
+ if(ismysql577 == wyTrue)
+ {
+ row = sja_mysql_fetch_row(m_tunnel, res);
+ continue;
+ }
+ }
else if(stricmp(row[0], "mysql") == 0 )
{
@@ -2204,7 +2212,8 @@ MySQLDump::DumpAlldbsToSingleFile(wyString * buffer, MYSQL_RES *dbres)
wyString dbname;
wyBool ismysql41 = IsMySQL41(m_tunnel, &m_mysql);
wyBool ismysql51 = IsMySQL5010(m_tunnel, &m_mysql);
- wyBool ismysql553 = IsMySQL553(m_tunnel, &m_mysql);
+ wyBool ismysql553 = IsMySQL553(m_tunnel, &m_mysql);
+ wyBool ismysql577 = IsMySQL577(m_tunnel, &m_mysql);
@@ -2221,6 +2230,9 @@ MySQLDump::DumpAlldbsToSingleFile(wyString * buffer, MYSQL_RES *dbres)
if((stricmp(dbname.GetString(), "PERFORMANCE_SCHEMA") == 0) && (ismysql553 == wyTrue))
continue;
+
+ if((stricmp(dbname.GetString(), "SYS") == 0) && (ismysql577 == wyTrue))
+ continue;
if((stricmp(dbname.GetString(), "MYSQL") == 0) && (m_expmysql == wyFalse))
continue;
@@ -2259,6 +2271,9 @@ MySQLDump::DumpAlldbsToSingleFile(wyString * buffer, MYSQL_RES *dbres)
if((stricmp(dbname.GetString(), "PERFORMANCE_SCHEMA") == 0) && (ismysql553 == wyTrue))
continue;
+ if((stricmp(dbname.GetString(), "SYS") == 0) && (ismysql577 == wyTrue))
+ continue;
+
if((stricmp(dbname.GetString(), "MYSQL") == 0) && (m_expmysql == wyFalse))
continue;
diff --git a/src/FrameWindowHelper.cpp b/src/FrameWindowHelper.cpp
index 5f458e8..75950b2 100644
--- a/src/FrameWindowHelper.cpp
+++ b/src/FrameWindowHelper.cpp
@@ -2692,14 +2692,12 @@ GetColLengthArray(MYSQL_ROW row, wyInt32 col, wyUInt32 *len)
// loop thru and get the length of each field
for (; ((INT)i) <= (col + 1); column++, arr++)
{
- if((INT)i!=col && (INT)i!=(col+1)){
if (!*column)
{
*arr = 0;
- //i++;
continue;
}
- }
+
if (start)
*plen = (unsigned long) ((byte*)*column-start-1);
@@ -3316,6 +3314,23 @@ IsShowWarnings()
}
+wyBool
+IsHaltExecutionOnError()
+{
+ wyWChar *lpfileport = 0;
+ wyWChar directory[MAX_PATH + 1]= {0};
+ wyInt32 ret;
+ wyString dirstr;
+
+ SearchFilePath(L"sqlyog", L".ini", MAX_PATH, directory, &lpfileport);
+ dirstr.SetAs(directory);
+
+ //getting show warnings status from init File
+ ret = wyIni::IniGetInt(GENERALPREFA, "HaltExecutionOnError", 0, dirstr.GetString());
+ return(ret)?(wyTrue):(wyFalse);
+
+}
+
// Function to write xml tags
wyBool
WriteXMLtags(HANDLE hfile, wyString *tags)
diff --git a/src/Htmlrender.cpp b/src/Htmlrender.cpp
index bfd035b..d84a080 100644
--- a/src/Htmlrender.cpp
+++ b/src/Htmlrender.cpp
@@ -63,7 +63,7 @@ HandleClickEventOnLink(HWND hwndLayout, HELEMENT helem, const wchar_t *url)
delete pref;
}
}
- else if(!wcsicmp(url, L"http://www.webyog.com/shop/?ref=community.queryprofiler"))
+ else if(!wcsicmp(url, L"http://www.webyog.com/product/sqlyogpricing/?ref=community.queryprofiler"))
{
::ShellExecuteW(hwndLayout,L"open", url, NULL,NULL,SW_SHOWNORMAL);
}
diff --git a/src/MySQLVersionHelper.cpp b/src/MySQLVersionHelper.cpp
index ef894f2..4c00d6b 100644
--- a/src/MySQLVersionHelper.cpp
+++ b/src/MySQLVersionHelper.cpp
@@ -455,6 +455,20 @@ wyBool IsMySQL57(Tunnel * tunnel, PMYSQL mysql)
}
+
+
+//MySQL 5.7.7
+wyBool
+IsMySQL577(Tunnel * tunnel, PMYSQL mysql)
+{
+ long me = mysql_get_server_version(*mysql);/* Only available from MySQLv4.1*/
+
+ if(me >= 50707)
+ return wyTrue;
+ else
+ return wyFalse;
+}
+
wyBool
IsMySQL502(Tunnel * tunnel, PMYSQL mysql)
{
diff --git a/src/PreferenceBase.cpp b/src/PreferenceBase.cpp
index 4c66648..3f6e47b 100644
--- a/src/PreferenceBase.cpp
+++ b/src/PreferenceBase.cpp
@@ -40,6 +40,7 @@ extern PGLOBALS pGlobals;
#define ROW_LIMIT_DEFAULT 1000
#define BULKINSERT_DEFAULT 1
#define SHOWWARNINGS_DEFAULT 0
+#define HALTEXEC_DEFAULT 0
#define INFOTAB_POS_DEFAULT 1
#define TABLEDATA_POS_DEFAULT 1
#define HISTORY_POS_DEFAULT 0
@@ -1165,6 +1166,9 @@ PreferenceBase::InitGeneralPrefValues()
truncdata = wyIni::IniGetInt(GENERALPREFA, "ShowWarnings", SHOWWARNINGS_DEFAULT, dirstr.GetString());
SendMessage(GetDlgItem(m_hwnd, IDC_SHOWWARNING), BM_SETCHECK, truncdata, 0);
+ truncdata = wyIni::IniGetInt(GENERALPREFA, "HaltExecutionOnError", HALTEXEC_DEFAULT, dirstr.GetString());
+ SendMessage(GetDlgItem(m_hwnd, IDC_HALTEXEC), BM_SETCHECK, truncdata, 0);
+
//disable fk check in http import batch
truncdata = wyIni::IniGetInt(GENERALPREFA, "FKcheckImport", FKCHKIMPORT_DEFAULT, dirstr.GetString());
SendMessage(GetDlgItem(m_hwnd, IDC_FKCHKIMPORT), BM_SETCHECK, truncdata, 0);
@@ -1619,6 +1623,7 @@ PreferenceBase::SaveGeneralPreferences(HWND hwndbase, wyInt32 page)
SetBoolProfileString(hwnd, GENERALPREF, L"FKcheckImport", IDC_FKCHKIMPORT);
SetBoolProfileString(hwnd, GENERALPREF, L"ShowWarnings", IDC_SHOWWARNING);
+ SetBoolProfileString(hwnd, GENERALPREF, L"HaltExecutionOnError", IDC_HALTEXEC);
SetBoolProfileString(hwnd, GENERALPREF, L"TableDataUnderQuery", IDC_TABLEDATAPOSITION);
SetBoolProfileString(hwnd, GENERALPREF, L"InfoTabUnderQuery", IDC_INFOPOSITION);
SetBoolProfileString(hwnd, GENERALPREF, L"HistoryUnderQuery", IDC_HISTORYPOSITION);
@@ -2137,6 +2142,7 @@ PreferenceBase::SetGenPrefDefaultValues(HWND hwnd)
EnableBulkInsert(hwnd, DEF_BULK_SIZE_DEFAULT);
SendMessage(GetDlgItem(hwnd, IDC_SHOWWARNING), BM_SETCHECK, SHOWWARNINGS_DEFAULT, 0);
+ SendMessage(GetDlgItem(hwnd, IDC_HALTEXEC), BM_SETCHECK, HALTEXEC_DEFAULT, 0);
SendMessage(GetDlgItem(hwnd, IDC_TABLEDATAPOSITION), BM_SETCHECK, TABLEDATA_POS_DEFAULT, 0);
SendMessage(GetDlgItem(hwnd, IDC_INFOPOSITION), BM_SETCHECK, INFOTAB_POS_DEFAULT, 0);
SendMessage(GetDlgItem(hwnd, IDC_HISTORYPOSITION), BM_SETCHECK, HISTORY_POS_DEFAULT, 0);
diff --git a/src/QueryThread.cpp b/src/QueryThread.cpp
index 7f344de..442a5fd 100644
--- a/src/QueryThread.cpp
+++ b/src/QueryThread.cpp
@@ -510,6 +510,8 @@ ExecuteQuery(QUERYTHREADPARAMS * param)
{
(*param->error)++;
param->wnd->m_isselectquery = wyFalse;
+ if(IsHaltExecutionOnError() == wyTrue)
+ break;
}
#ifndef COMMUNITY
diff --git a/src/TabAdvancedProperties.cpp b/src/TabAdvancedProperties.cpp
index 434bfa2..15284c8 100644
--- a/src/TabAdvancedProperties.cpp
+++ b/src/TabAdvancedProperties.cpp
@@ -844,7 +844,7 @@ void
TabAdvancedProperties::GenerateCreateQuery(wyString &query)
{
wyInt32 selindex, ret;
- wyWChar textbuf[512]={0}; // none of the value will go more then this and neway we send the max len to the api so it will not fail
+ wyWChar textbuf[2049]={0}; // none of the value will go more then this and neway we send the max len to the api so it will not fail
wyChar* commentbuff = {0};
wyString enginestr, rowformat, tempstr;
wyString advpropval;
@@ -882,7 +882,7 @@ TabAdvancedProperties::GenerateCreateQuery(wyString &query)
}
// 5. The comment.
- SendMessage(m_heditcomment, WM_GETTEXT, 511, (LPARAM)textbuf);
+ SendMessage(m_heditcomment, WM_GETTEXT, 2049, (LPARAM)textbuf);
tempstr.SetAs(textbuf);
// Escape the comment string
@@ -965,7 +965,7 @@ void
TabAdvancedProperties::GenerateAlterQuery(wyString &query)
{
wyInt32 selindex, ret;
- wyWChar textbuf[512]={0}; // none of the value will go more then this and neway we send the max len to the api so it will not fail
+ wyWChar textbuf[2049]={0}; // none of the value will go more then this and neway we send the max len to the api so it will not fail
wyChar* commentbuff = {0};//, commentbuff2 = {0};
wyString enginestr, rowformat, tempstr, newline("\r\n ");
wyString advpropval;
@@ -1016,7 +1016,7 @@ TabAdvancedProperties::GenerateAlterQuery(wyString &query)
}
// 5. The comment thing.
- SendMessage(m_heditcomment, WM_GETTEXT, 511, (LPARAM)textbuf);
+ SendMessage(m_heditcomment, WM_GETTEXT, 2049, (LPARAM)textbuf);
tempstr.SetAs(textbuf);
// Escape the comment string
diff --git a/src/UserManager.cpp b/src/UserManager.cpp
index 61658fd..85040a2 100644
--- a/src/UserManager.cpp
+++ b/src/UserManager.cpp
@@ -409,7 +409,7 @@ UserManager::InitDialog(HWND hwnd)
(WPARAM)LVS_EX_CHECKBOXES,(LPARAM)LVS_EX_CHECKBOXES);
//limit the text in various edit controls
- SendMessage(GetDlgItem(m_hwnd, IDC_USERNAME), EM_LIMITTEXT, (WPARAM)16, 0);
+ SendMessage(GetDlgItem(m_hwnd, IDC_USERNAME), EM_LIMITTEXT, (WPARAM)32, 0);
SendMessage(GetDlgItem(m_hwnd, IDC_HOSTNAME), CB_LIMITTEXT, (WPARAM)60, 0);
//add some default strings for the host combo