diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-23 15:18:05 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-23 15:18:05 -0800 |
| commit | 32151409c13ddc09ebda7cd02fdfe40db290503e (patch) | |
| tree | 86997a41bbc6c4379209af0cccdb4ae612c8d4f4 /sql/item_sum.cc | |
| parent | f1e758dc6f4183a8e3856d21c95f7e4973c585c1 (diff) | |
| parent | 746152959a8787f3c7cf6b1c710fc1ee6c54419f (diff) | |
| download | mariadb-git-32151409c13ddc09ebda7cd02fdfe40db290503e.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 58d605478af..04358ac8c45 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1086,7 +1086,7 @@ void Aggregator_distinct::endup() { /* go over the tree of distinct keys and calculate the aggregate value */ use_distinct_values= TRUE; - tree->walk(item_sum_distinct_walk, (void*) this); + tree->walk(table, item_sum_distinct_walk, (void*) this); use_distinct_values= FALSE; } /* prevent consecutive recalculations */ |