~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

Committer: Brian Aker
Date: 2010-08-19 16:45:03 UTC
mfrom: (1711.6.11 staging)
Revision ID: brian@tangent.org-20100819164503-t7rhibp5s7bv3dtu

Merge of signals, plus build fix for FreeBSD. Also contains memset/constructor patch.

files added:
plugin/crash_function

plugin/crash_function/crash.cc

plugin/crash_function/plugin.ini

plugin/shutdown_function

plugin/shutdown_function/plugin.ini

plugin/shutdown_function/shutdown.cc

files removed:
drizzled/stacktrace.cc

drizzled/stacktrace.h

tests/resolve_stack_dump.cc

files modified:
configure.ac

drizzled/drizzled.cc

drizzled/drizzled.h

drizzled/filesort_info.h

drizzled/handler_structs.h

drizzled/include.am

drizzled/internal/my_pthread.h

drizzled/internal/my_thr_init.cc

drizzled/join.cc

drizzled/main.cc

drizzled/memory/root.h

drizzled/records.cc

drizzled/records.h

drizzled/signal_handler.cc

drizzled/sql_delete.cc

drizzled/sql_yacc.yy

drizzled/symbol_hash.gperf

drizzled/table.cc

plugin/myisam/myisam.h

plugin/signal_handler/signal_handler.cc

po/POTFILES.in

support-files/drizzle.spec.in

tests/include.am

Show diffs side-by-side

added added

removed removed

drizzled/join.cc

4409

join_tab->read_first_record= join_init_read_record;

4410

join_tab->join=join;

4411

join_tab->ref.key_parts= 0;

4412

memset(&join_tab->read_record, 0, sizeof(join_tab->read_record));

4412

join_tab->read_record.init();

4413

tmp_table->status=0;

4414

tmp_table->null_row=0;

4415

return(false);

4415

4416

return false;

4416

4417

}

4417

4418

4419

/**

Older »