diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-05 15:59:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-05 15:59:41 +0200 |
| commit | fde6ee61bbdeb051a169aac8da56e24bf2accdce (patch) | |
| tree | b76e558c0dd894876c2a9d92572b9b8235992a20 /sql/sql_select.h | |
| parent | 37d353770f4c8837a7dd8c674ab6022ec4582405 (diff) | |
| download | mariadb-git-fde6ee61bbdeb051a169aac8da56e24bf2accdce.tar.gz | |
revert the fix for MDEV-5898, restore the fix for MDEV-5549.
simplify test case for MDEV-5898
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 271199e3d51..bc6aa1eda1e 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -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 |