diff options
author | unknown <monty@mysql.com> | 2005-02-25 16:53:22 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-02-25 16:53:22 +0200 |
commit | 248e44945161ec6a84072c8684447aeb702e5bd7 (patch) | |
tree | 9b48fa5a8476d449ea4512314b86f9704517cd0c /sql/item_sum.cc | |
parent | eb18f93a7847ca6cdb8430d4500a797fe68826db (diff) | |
download | mariadb-git-248e44945161ec6a84072c8684447aeb702e5bd7.tar.gz |
Remove compiler warnings and remove not used variables
(Found during build process)
extra/comp_err.c:
Remove compiler warnings
extra/perror.c:
Remove compiler warnings
innobase/dict/dict0dict.c:
Remove compiler warnings
innobase/dict/dict0load.c:
Remove compiler warnings
innobase/pars/pars0sym.c:
Remove compiler warnings
innobase/row/row0row.c:
Remove compiler warnings
innobase/row/row0sel.c:
Remove compiler warnings
libmysqld/lib_sql.cc:
Remove not used variables
myisam/mi_key.c:
Remove compiler warnings
regex/engine.c:
Added comment
sql/derror.cc:
Remove not used variables
sql/examples/ha_archive.cc:
Fixed bug in blob handling
Removed not used variable
sql/field.cc:
Remove compiler warnings
Remove not used variables
sql/filesort.cc:
Remove compiler warnings
sql/ha_heap.cc:
Remove not used variable
sql/ha_innodb.cc:
Remove not used variables
Remove compiler warnings
sql/handler.cc:
Remove compiler warnings and remove not used variables
sql/item.cc:
Remove compiler warnings and remove not used variables
sql/item_subselect.cc:
Remove compiler warnings
sql/item_sum.cc:
Remove compiler warnings
sql/item_sum.h:
Remove compiler warnings and remove not used variables
sql/log.cc:
Remove compiler warnings and remove not used variables
sql/log_event.cc:
Remove compiler warnings
sql/mysqld.cc:
Remove compiler warnings and remove not used variables
sql/opt_range.cc:
Remove compiler warnings and remove not used variables
sql/slave.cc:
Remove compiler warnings and remove not used variables
sql/sp_pcontext.cc:
Remove compiler warnings and remove not used variables
sql/sql_acl.cc:
Remove compiler warnings and remove not used variables
sql/sql_analyse.cc:
Remove compiler warnings and remove not used variables
sql/sql_base.cc:
Remove compiler warnings and remove not used variables
sql/sql_db.cc:
Remove compiler warnings and remove not used variables
sql/sql_help.cc:
Remove compiler warnings and remove not used variables
sql/sql_insert.cc:
Remove compiler warnings and remove not used variables
sql/sql_load.cc:
Remove compiler warnings and remove not used variables
sql/sql_parse.cc:
Remove compiler warnings and remove not used variables
sql/sql_prepare.cc:
Remove compiler warnings and remove not used variables
sql/sql_select.cc:
Remove compiler warnings and remove not used variables
sql/sql_show.cc:
Remove compiler warnings and remove not used variables
sql/sql_table.cc:
Remove compiler warnings
sql/sql_union.cc:
Remove compiler warnings
sql/sql_update.cc:
Remove compiler warnings and remove not used variables
sql/sql_yacc.yy:
Remove compiler warnings and remove not used variables
sql/strfunc.cc:
Remove compiler warnings and remove not used variables
strings/ctype-ucs2.c:
Remove compiler warnings
tests/mysql_client_test.c:
Remove compiler warnings and remove not used variables
tools/mysqlmanager.c:
Remove compiler warnings and remove not used variables
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r-- | sql/item_sum.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 9a4798b9dc9..3df985b6c99 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -532,7 +532,7 @@ bool Item_sum_sum_distinct::setup(THD *thd) void Item_sum_sum_distinct::clear() { DBUG_ENTER("Item_sum_sum_distinct::clear"); - DBUG_ASSERT(tree); /* we always have a tree */ + DBUG_ASSERT(tree != 0); /* we always have a tree */ null_value= 1; tree->reset(); DBUG_VOID_RETURN; @@ -554,7 +554,7 @@ bool Item_sum_sum_distinct::add() my_decimal value, *val= args[0]->val_decimal(&value); if (!args[0]->null_value) { - DBUG_ASSERT(tree); + DBUG_ASSERT(tree != 0); null_value= 0; my_decimal2binary(E_DEC_FATAL_ERROR, val, (char *) dec_bin_buff, args[0]->max_length, args[0]->decimals); @@ -567,7 +567,7 @@ bool Item_sum_sum_distinct::add() double val= args[0]->val_real(); if (!args[0]->null_value) { - DBUG_ASSERT(tree); + DBUG_ASSERT(tree != 0); null_value= 0; DBUG_PRINT("info", ("real: %lg, tree 0x%lx", val, (ulong)tree)); if (val) @@ -1179,7 +1179,6 @@ double Item_sum_hybrid::val_real() DBUG_ASSERT(0); return 0; } - return 0; // Keep compiler happy } longlong Item_sum_hybrid::val_int() |