summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-01-03 21:04:33 +0200
committermonty@mysql.com <>2005-01-03 21:04:33 +0200
commit2299e1eca4230465f3d9b8ca0df49330bec093d2 (patch)
treeca151e2a0c44dc6a1c8ca642907f92d7be53c489 /sql/item_sum.h
parente205136170de05f1c84138518b912abb8e445561 (diff)
downloadmariadb-git-2299e1eca4230465f3d9b8ca0df49330bec093d2.tar.gz
Better handling of ensuring that setup_tables() are not called twice
This fixed a bug in prepared statements when used with outher joins Fixed a bug in SUM(DISTINCT) when used with prepared statements. Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 157791722f6..68899268b31 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -167,10 +167,11 @@ private:
Item_sum_sum_distinct(THD *thd, Item_sum_sum_distinct *item);
public:
Item_sum_sum_distinct(Item *item_par);
- ~Item_sum_sum_distinct();
+ ~Item_sum_sum_distinct() {}
bool setup(THD *thd);
void clear();
+ void cleanup();
bool add();
double val_real();