diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-22 22:51:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-22 22:51:20 +0100 |
| commit | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (patch) | |
| tree | 63150adc067c1bb6cb476eef00094083e1a53865 /sql/sql_select.h | |
| parent | 004642525d8c4ed02686719395faf477e94cd618 (diff) | |
| parent | 3e03c9eae9089cd2cae0f378bd81ff29367f41eb (diff) | |
| download | mariadb-git-ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 0d7ea6d9121..30d2f4abe56 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1129,7 +1129,8 @@ public: */ JOIN *tmp_join; ROLLUP rollup; ///< Used with rollup - + + bool mixed_implicit_grouping; bool select_distinct; ///< Set if SELECT DISTINCT /** If we have the GROUP BY statement in the query, |