Merge lp:~hingo/drizzle/drizzle-rescue-drizzle_password_hash into lp:~drizzle-trunk/drizzle/development
Proposed by
Henrik Ingo
Status: | Merged |
---|---|
Approved by: | Brian Aker |
Approved revision: | 2483 |
Merged at revision: | 2495 |
Proposed branch: | lp:~hingo/drizzle/drizzle-rescue-drizzle_password_hash |
Merge into: | lp:~drizzle-trunk/drizzle/development |
Diff against target: |
143 lines (+8/-79) 4 files modified
.bzrignore (+1/-2) client/include.am (+6/-1) libdrizzle-2.0/include.am (+1/-14) libdrizzle-2.0/mysql_password_hash.cc (+0/-62) |
To merge this branch: | bzr merge lp:~hingo/drizzle/drizzle-rescue-drizzle_password_hash |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Merge Team | Pending | ||
Review via email: mp+88475@code.launchpad.net |
Description of the change
With the recent rehash of libdrizzle files, one binary called drizzle_
This fixes the problem by moving the source file to client/
To post a comment you must log in.