Merge lp://qastaging/~brianaker/drizzle/new-5.5-auth into lp://qastaging/drizzle/7.0
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2230 |
| Merged at revision: | 2231 |
| Proposed branch: | lp://qastaging/~brianaker/drizzle/new-5.5-auth |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
260 lines (+59/-18) 8 files modified
client/drizzle.cc (+22/-8) libdrizzle/constants.h (+5/-2) libdrizzle/handshake.c (+5/-0) libdrizzle/pack.c (+9/-4) plugin/auth_pam/auth_pam.cc (+2/-3) plugin/auth_pam/plugin.ini (+2/-0) plugin/mysql_protocol/mysql_protocol.cc (+12/-1) plugin/mysql_protocol/options.h (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/drizzle/new-5.5-auth |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
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
