database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

revert the fix for MDEV-5898, restore the fix for MDEV-5549.

Browse Source 
simplify test case for MDEV-5898
This commit is contained in:
Sergei Golubchik
2014-06-05 15:59:41 +02:00
parent 37d353770f
commit fde6ee61bb
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.h
View File

@@ -1119,6 +1119,12 @@ public:
restore_no_rows_in_result() in ::reinit()
*/
bool no_rows_in_result_called;
/**
This is set if SQL_CALC_ROWS was calculated by filesort()
and should be taken from the appropriate JOIN_TAB
*/
bool filesort_found_rows;
/**
Copy of this JOIN to be used with temporary tables.
@@ -1335,6 +1341,7 @@ public:
emb_sjm_nest= NULL;
sjm_lookup_tables= 0;
filesort_found_rows= false;
exec_saved_explain= false;
/*
The following is needed because JOIN::cleanup(true) may be called for