lp://staging/~linuxjedi/drizzle/trunk-bug-628397

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/drizzle/7.0 at revision 2047

Drizzle Developers: Pending requested 2011-01-01

Diff: 46 lines (+19/-5)

1 file modified

drizzled/join.cc (+19/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #628397: Crash / segfault in add_found_match_trig_cond (tab=0x0, cond=0x1c778c8, root_tab=0x1c82c80) at drizzled/sql_select.cc:1209

High

Fix Released

Link a bug report

Related blueprints

2045. By Andrew Hutchings on 2011-01-01

Backport fix for MySQL bug #52005

2044. By Brian Aker on 2010-12-31

Partial update to the time code.

2043. By Brian Aker on 2010-12-31

See if the boost atomic counter will work.

2042. By Lee Bieber on 2010-12-30

Merge Andrew - fix bug 632755: Crash / assertion failed in drizzled::Session::free_cached_table (this=0x7f83a42c63f0) at drizzled/sql_base.cc:513
Merge Lee - update tests to run with --repeat=2
Merge Shrews - 695755: filtered_replicator test hangs after first run when run with --repeat=2

2041. By Brian Aker on 2010-12-30

Rollup of assert(), etc.

2040. By Lee Bieber on 2010-12-29

Merge Andrew - fix bug 683620: Unhandled exception from boost::thread::start_thread
Merge Stewart - fix bug 695203: test-run --gdb no longer sets breakpoint
Merge Lee - some minor copyright updates

2039. By Lee Bieber on 2010-12-28

in POTFILES.in change plugin/innobase/srv/srv0start.c to plugin/innobase/srv/srv0start.cc

2038. By Lee Bieber on 2010-12-28

Merge Monty, move innobase from C to C++

2037. By Brian Aker on 2010-12-28

Merge in boolean.

2036. By Brian Aker on 2010-12-27

Merge in additional encapsulation of Decimal