diff options
author | unknown <monty@mysql.com> | 2005-05-20 16:14:35 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-05-20 16:14:35 +0300 |
commit | 027c10f3bbc5ad54a104909f5587effe246d7ed5 (patch) | |
tree | aa7fb9173589000beb4052d77262a95532b07c2e /sql/sql_select.cc | |
parent | 3034935a875d959c21af79d08fbda2a1d32f11c6 (diff) | |
download | mariadb-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/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 99373276410..71414f8cc76 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -12655,8 +12655,10 @@ static bool setup_sum_funcs(THD *thd, Item_sum **func_ptr) Item_sum *func; DBUG_ENTER("setup_sum_funcs"); while ((func= *(func_ptr++))) + { if (func->setup(thd)) DBUG_RETURN(TRUE); + } DBUG_RETURN(FALSE); } @@ -12943,8 +12945,6 @@ bool JOIN::rollup_make_fields(List<Item> &fields_arg, List<Item> &sel_fields, */ item= item->copy_or_same(thd); ((Item_sum*) item)->make_unique(); - if (((Item_sum*) item)->setup(thd)) - return 1; *(*func)= (Item_sum*) item; (*func)++; } |