diff options
| author | Michael Widenius <monty@mariadb.org> | 2016-06-25 20:55:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 11:43:02 +0200 |
| commit | 2fe8dd0f90e2bbe0180e30c36ebc9132fcdd4b06 (patch) | |
| tree | 4d84b1ddb3e0af4660d52c0ac1792e85c652fc0d /sql/item_sum.h | |
| parent | db7edfed17efe6bc3684b0fbacc0b0249e4f0fa2 (diff) | |
| download | mariadb-git-2fe8dd0f90e2bbe0180e30c36ebc9132fcdd4b06.tar.gz | |
various cleanups
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 8fcc4e203bc..7c11205ba5f 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -61,7 +61,7 @@ public: Aggregator (Item_sum *arg): item_sum(arg) {} virtual ~Aggregator () {} /* Keep gcc happy */ - enum Aggregator_type { SIMPLE_AGGREGATOR, DISTINCT_AGGREGATOR }; + enum Aggregator_type { SIMPLE_AGGREGATOR, DISTINCT_AGGREGATOR }; virtual Aggregator_type Aggrtype() = 0; /** @@ -411,8 +411,8 @@ public: */ inline bool reset_and_add() { - aggregator_clear(); - return aggregator_add(); + aggregator_clear(); + return aggregator_add(); }; /* @@ -458,7 +458,7 @@ public: */ void make_const () { - used_tables_cache= 0; + used_tables_cache= 0; const_item_cache= true; } virtual bool const_during_execution() const { return false; } |