Merge lp://qastaging/~mordred/drizzle/merge-vs-work into lp://qastaging/drizzle/7.0
Proposed by
Monty Taylor
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2166 |
| Proposed branch: | lp://qastaging/~mordred/drizzle/merge-vs-work |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
3041 lines (+378/-2396) 23 files modified
examples/proxy.c (+2/-0) examples/server.c (+2/-0) examples/simple.c (+2/-0) examples/simple_multi.c (+2/-0) libdrizzle/common.h (+5/-3) libdrizzle/conn.c (+5/-2) libdrizzle/drizzle.c (+3/-3) libdrizzle/drizzle.h (+28/-20) libdrizzle/structs.h (+1/-2) win32/alloca.c (+0/-506) win32/alloca.h (+0/-55) win32/config.h (+3/-3) win32/conn_uds.c (+1/-1) win32/drizzle.sln (+3/-3) win32/libdrizzle.vcproj (+0/-418) win32/libdrizzle.vcxproj (+144/-0) win32/libdrizzle.vcxproj.filters (+162/-0) win32/mingw/errno.h (+0/-133) win32/mingw/poll.c (+0/-562) win32/mingw/poll.h (+0/-53) win32/poll.c (+0/-562) win32/poll.h (+0/-53) win32/windows/errno.h (+15/-17) |
| To merge this branch: | bzr merge lp://qastaging/~mordred/drizzle/merge-vs-work |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Merged in outstanding work for building drizzle on visual studio.
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
