Merge lp://qastaging/~linuxjedi/libdrizzle/5.1-con-opts2 into lp://qastaging/libdrizzle
Proposed by
Andrew Hutchings
| Status: | Merged |
|---|---|
| Approved by: | Andrew Hutchings |
| Approved revision: | 97 |
| Merged at revision: | 97 |
| Proposed branch: | lp://qastaging/~linuxjedi/libdrizzle/5.1-con-opts2 |
| Merge into: | lp://qastaging/libdrizzle |
| Diff against target: |
678 lines (+237/-144) 11 files modified
libdrizzle-5.1/conn.h (+41/-42) libdrizzle-5.1/constants.h (+1/-23) libdrizzle-5.1/drizzle_client.h (+2/-2) libdrizzle/command.cc (+1/-2) libdrizzle/conn.cc (+127/-52) libdrizzle/drizzle.cc (+12/-6) libdrizzle/field.cc (+1/-1) libdrizzle/handshake.cc (+8/-6) libdrizzle/pack.cc (+2/-2) libdrizzle/statement.cc (+6/-6) libdrizzle/structs.h (+36/-2) |
| To merge this branch: | bzr merge lp://qastaging/~linuxjedi/libdrizzle/5.1-con-opts2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Trunk | Pending | ||
|
Review via email:
|
|||
Description of the change
Split out con options into state and options
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
