Fix emptied "SHOW WARNINGS" pool due to queried @max_error_count in w…

…arning dialog. See https://www.heidisql.com/forum.php?t=41753
HeidiSQL · Feb 7, 2024 · 6d3f24b · 6d3f24b
1 parent d43893b
commit 6d3f24b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2023-12-02 14:00+0100\n"
+"PO-Revision-Date: 2024-02-07 07:28+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.1\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #. AboutBox..Caption
 #: about.dfm:5
@@ -4483,10 +4483,6 @@ msgstr "First %s warnings:"
 msgid "Show all warnings in a new query tab?"
 msgstr "Show all warnings in a new query tab?"
 
-#: main.pas:2364
-msgid "The server variable %s is currently set to %d, so you won't see all warnings."
-msgstr "The server variable %s is currently set to %d, so you won't see all warnings."
-
 #: main.pas:2379
 msgid "Updating query history ..."
 msgstr "Updating query history ..."

diff --git a/source/main.pas b/source/main.pas
@@ -3391,7 +3391,7 @@ procedure TMainForm.FinishedQueryExecution(Thread: TQueryThread);
   History: TQueryHistory;
   HistoryItem: TQueryHistoryItem;
   Warnings: TDBQuery;
-  HistoryNum, MaxWarnings, RegItemsSize, KeepDays: Integer;
+  HistoryNum, RegItemsSize, KeepDays: Integer;
   DoDelete, ValueFound: Boolean;
   MinDate: TDateTime;
 
@@ -3491,20 +3491,14 @@ procedure TMainForm.FinishedQueryExecution(Thread: TQueryThread);
       MsgText := MsgText + Warnings.Col('Level') + ': ' + Warnings.Col('Message') + CRLF;
       Warnings.Next;
     end;
-    MsgText := Trim(MsgText);
-    if (Warnings.RecordCount = Thread.WarningCount) or (Warnings.RecordCount < 5) then
-      MessageDialog(MsgTitle, MsgText, mtWarning, [mbOk], asQueryWarningsMessage)
-    else begin
-      MsgText := MsgText + CRLF+CRLF + _('Show all warnings in a new query tab?');
-      MaxWarnings := MakeInt(Thread.Connection.GetVar('SELECT @@max_error_count'));
-      if MaxWarnings < Thread.WarningCount then
-        MsgText := MsgText + CRLF+CRLF+ f_('The server variable %s is currently set to %d, so you won''t see all warnings.', ['@@max_error_count', MaxWarnings]);
-      if MessageDialog(MsgTitle, MsgText, mtWarning, [mbYes, mbNo], asQueryWarningsMessage) = mrYes then begin
-        actNewQueryTab.Execute;
-        WarningsTab := QueryTabs[QueryTabs.Count-1];
-        WarningsTab.Memo.Text := 'SHOW WARNINGS';
-        actExecuteQueryExecute(WarningsTab);
-      end;
+    MsgText := Trim(MsgText) + SLineBreak +
+      SLineBreak +
+      _('Show all warnings in a new query tab?');
+    if MessageDialog(MsgTitle, MsgText, mtWarning, [mbYes, mbNo], asQueryWarningsMessage) = mrYes then begin
+      actNewQueryTab.Execute;
+      WarningsTab := QueryTabs[QueryTabs.Count-1];
+      WarningsTab.Memo.Text := 'SHOW WARNINGS';
+      actExecuteQueryExecute(WarningsTab);
     end;
   end;