summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-05-20 16:14:35 +0300
committerunknown <monty@mysql.com>2005-05-20 16:14:35 +0300
commit027c10f3bbc5ad54a104909f5587effe246d7ed5 (patch)
treeaa7fb9173589000beb4052d77262a95532b07c2e /sql/item_sum.cc
parent3034935a875d959c21af79d08fbda2a1d32f11c6 (diff)
downloadmariadb-git-027c10f3bbc5ad54a104909f5587effe246d7ed5.tar.gz
compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains) myisam/rt_split.c: Added missing cast that caused problem on novell (minor code cleanup) ndb/src/ndbapi/Ndb.cpp: Moved DBUG_ENTER to remove warning from DBUG library sql/field_conv.cc: Added test for valgrind/purify to avoid warning sql/item_sum.cc: Removed comment and added ASSERT as setup can't be called twice anymore sql/sql_delete.cc: Fixed wrong return value sql/sql_parse.cc: More debugging sql/sql_select.cc: Removed duplicate call to setup() which caused a memory leak strings/my_vsnprintf.c: Added support for '%c' (used when printing my_getopt errors)
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index a5694189976..85abb09531b 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -584,13 +584,8 @@ bool Item_sum_distinct::setup(THD *thd)
{
List<create_field> field_list;
create_field field_def; /* field definition */
-
DBUG_ENTER("Item_sum_distinct::setup");
-
- /*
- Setup can be called twice for ROLLUP items. This is a bug.
- Please add DBUG_ASSERT(tree == 0) here when it's fixed.
- */
+ DBUG_ASSERT(tree == 0);
/*
Virtual table and the tree are created anew on each re-execution of
@@ -610,7 +605,7 @@ bool Item_sum_distinct::setup(THD *thd)
args[0]->unsigned_flag);
if (! (table= create_virtual_tmp_table(thd, field_list)))
- return TRUE;
+ return TRUE;
/* XXX: check that the case of CHAR(0) works OK */
tree_key_length= table->s->reclength - table->s->null_bytes;