Merge lp://qastaging/~brianaker/drizzle/safe_delete into lp://qastaging/drizzle/7.0
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2194 |
| Merged at revision: | 2183 |
| Proposed branch: | lp://qastaging/~brianaker/drizzle/safe_delete |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
516 lines (+61/-92) 14 files modified
drizzled/cached_directory.cc (+2/-3) drizzled/cursor.cc (+1/-1) drizzled/definitions.h (+6/-0) drizzled/sql_base.cc (+2/-3) drizzled/sql_lex.cc (+3/-4) drizzled/sql_parse.cc (+1/-0) drizzled/sql_select.cc (+7/-9) drizzled/sql_union.cc (+2/-4) drizzled/sql_update.cc (+2/-4) drizzled/sql_yacc.yy (+34/-55) drizzled/symbol_hash.gperf (+0/-3) drizzled/table.cc (+1/-2) tests/r/select.result (+0/-3) tests/t/select.test (+0/-1) |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/drizzle/safe_delete |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
See comments in revision control.
To post a comment you must log in.
Revision history for this message
| Andrew Hutchings (linuxjedi) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
ah, nice one :)