Merge lp://qastaging/~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes into lp://qastaging/~drizzle-trunk/drizzle/development
Proposed by
Henrik Ingo
| Status: | Merged |
|---|---|
| Approved by: | Mark Atwood |
| Approved revision: | 2506 |
| Merged at revision: | 2504 |
| Proposed branch: | lp://qastaging/~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes |
| Merge into: | lp://qastaging/~drizzle-trunk/drizzle/development |
| Diff against target: |
743 lines (+65/-434) 18 files modified
.bzrignore (+2/-0) .bzrignore.THIS (+0/-389) Makefile.am (+1/-15) client/drizzle.cc (+2/-2) client/drizzledump.cc (+2/-2) client/server_detect.cc (+13/-3) configure.ac (+2/-2) docs/installing/redhat.rst (+3/-1) drizzled/main.cc (+2/-2) drizzled/sys_var.cc (+4/-4) m4/pandora_vc_build.m4 (+23/-3) plugin/auth_ldap/docs/index.rst (+3/-3) plugin/innobase/xtrabackup/xtrabackup.cc (+1/-1) support-files/drizzle.pc.in (+1/-1) support-files/include.am (+1/-1) tests/r/comments.result (+2/-2) tests/valgrind.supp (+2/-2) win32/config.h (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Merge Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Combines
https:/
and
https:/
To recap:
To pass all tests, you must do bzr tag 7.1.31-rc first
If you don't, then main.comments will fail, this is correct behavior. Everything else should pass either way.
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
