opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully fix bug #684. To be tested...

Browse Source 
Caused by: SELECT @found_rows fired by Zeos internally without having this variable set previously. (I wonder why this only happened in certain situations)
Solution: Remove SQL_CALC_FOUND_ROWS stuff completely as we don't need it anymore having EnsureDataLoaded().
This commit is contained in:
Ansgar Becker
2008-08-15 18:32:54 +00:00
parent d0086ea2dc
commit 6d27b71578
2 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/zeosdbo/src/dbc/ZDbcMySqlResultSet.pas
View File

@ -236,15 +236,6 @@ begin
else LastRowNo := 0; else LastRowNo := 0;
end; end;
{***
@note ansgarbecker:
Store FOUND_ROWS() in variable so we can use that in HeidiSQL's data tab
}
if pos( 'SQL_CALC_FOUND_ROWS', FSQL ) > 0 then
begin
Statement.GetConnection.CreateStatement.Execute('SET @found_rows = FOUND_ROWS()');
end;
if not Assigned(FQueryHandle) then if not Assigned(FQueryHandle) then
raise EZSQLException.Create(SCanNotRetrieveResultSetData); raise EZSQLException.Create(SCanNotRetrieveResultSetData);

26
source/childwin.pas
View File

@ -1296,8 +1296,6 @@ begin
// Try to calc the rowcount regardless of a given LIMIT // Try to calc the rowcount regardless of a given LIMIT
// Only needed if the user specified a WHERE-clause // Only needed if the user specified a WHERE-clause
Filter := GetFilter; Filter := GetFilter;
if (mysql_version >= 40000) and (Filter <> '') then
select_base := select_base + ' SQL_CALC_FOUND_ROWS';
// Selected columns // Selected columns
if DisplayedColumnsList.Count = 0 then begin if DisplayedColumnsList.Count = 0 then begin
FSelectedTableColumns.First; FSelectedTableColumns.First;
@ -1427,29 +1425,7 @@ begin
lblDataTop.Caption := lblDataTop.Caption + ' [View]'; lblDataTop.Caption := lblDataTop.Caption + ' [View]';
end; end;
{*** rows_matching := DataGrid.RootNodeCount;
@note: FOUND_ROWS() gives us a correct number, but this number
belongs in most cases to a different query than the previous SELECT,
because Zeos does some automagically
SHOW TABLES LIKE '' and
SHOW COLUMNS LIKE '%'
between the above SELECT and a following "SELECT FOUND_ROWS()".
This problem has been introduced with the fix of
a faulty caching-mechanism in Zeos (rev 312).
and those queries seem to reset the FOUND_ROWS() since MySQL 5.0
The workaround is to store FOUND_ROWS() immediately after query-execution
in a variable, which we are selecting here.
@see TZMySQLResultSet:Create
@see TZMySQLResultSet:Open
}
if Filter <> '' then begin
if mysql_version >= 40000 then
rows_matching := StrToInt64Def(GetVar('SELECT @found_rows'), 0)
else
rows_matching := DataGrid.RootNodeCount;
end
else
rows_matching := rows_total;
if( rows_matching <> rows_total ) and if( rows_matching <> rows_total ) and
(Filter <> '') then (Filter <> '') then