summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-19 20:33:12 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-19 20:33:12 +0100
commit9418bd9c2167ef6a75d7d1bfaaf5e2cf94d09bae (patch)
tree7555f2df23c72b1b6eea47aab5542be24742f94c /sql/sql_select.h
parent1fa1ea0f2df62796a89df8f00f49a4e77d7cf478 (diff)
downloadmariadb-git-9418bd9c2167ef6a75d7d1bfaaf5e2cf94d09bae.tar.gz
MDEV-5898 FOUND_ROWS() return incorrect value when using DISTINCT
revert the fix for MDEV-5549, use a different approach.
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index bc6aa1eda1e..271199e3d51 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1119,12 +1119,6 @@ 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.
@@ -1341,7 +1335,6 @@ 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