Merge lp://qastaging/~mordred/drizzle/libdrizzle-less into lp://qastaging/drizzle/7.0
Proposed by
Monty Taylor
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2240 |
| Merged at revision: | 2237 |
| Proposed branch: | lp://qastaging/~mordred/drizzle/libdrizzle-less |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
208 lines (+56/-17) 8 files modified
configure.ac (+5/-2) libdrizzle/conn.c (+2/-2) libdrizzle/include.am (+7/-7) libdrizzle/query.c (+14/-3) libdrizzle/query.h (+2/-0) support-files/include.am (+1/-1) support-files/libdrizzle-1.0.pc.in (+3/-2) unittests/libdrizzle_test.cc (+22/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mordred/drizzle/libdrizzle-less |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Applies the changes from libdrizzle-cxx without the c++-ization (two bugfixes from Andrew and the libdrizzle-1.0 location from me)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
