← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/item_sum.cc

Committer: Monty Taylor
Date: 2008-07-07 16:41:35 UTC
mfrom: (80.1.1 food)
mto: (28.2.2 packaging) (80.3.5 drizzle-stew-remove-old_password) (77.6.1 glibclient-merge)
mto: This revision was merged to the branch mainline in revision 84.
Revision ID: monty@inaugust.com-20080707164135-das529g4d5zcgp9q

Merged from trunk.

files modified:
configure.ac

include/my_bitmap.h

include/my_global.h

include/my_pthread.h

include/myisam.h

mysys/my_getsystime.c

mysys/typelib.c

sql-common/my_time.c

sql-common/pack.c

sql/field.cc

sql/handler.h

sql/item.cc

sql/item.h

sql/item_func.cc

sql/item_sum.cc

sql/item_sum.h

sql/item_timefunc.cc

sql/log_event.h

sql/mysql_priv.h

sql/set_var.cc

sql/sql_delete.cc

sql/sql_lex.cc

sql/sql_parse.cc

sql/sql_plugin.cc

sql/sql_repl.cc

sql/sql_select.cc

sql/sql_udf.h

sql/time.cc

storage/archive/archive_performance.c

storage/archive/archive_test.c

storage/innobase/handler/ha_innodb.cc

storage/myisam/mi_create.c

storage/myisam/myisampack.c

strings/ctype-ucs2.c

strings/decimal.c

strings/my_strtoll10.c

Show diffs side-by-side

added added

removed removed

sql/item_sum.cc

2713

2713

int error;

2714

2714

DBUG_ASSERT(fixed == 1);

2715

2715

if (!table) // Empty query

2716

return LL(0);

2716

return 0LL;

2717

2717

if (tree)

2718

2718

{

2719

2719

if (is_evaluated)

Older »