Drizzle

Merge lp://qastaging/~mordred/drizzle/libdrizzle-cxx into lp://qastaging/drizzle/7.0

Proposed by Monty Taylor on 2011-01-06

Status:	Superseded
Proposed branch:	lp://qastaging/~mordred/drizzle/libdrizzle-cxx
Merge into:	lp://qastaging/drizzle/7.0
Diff against target:	1660 lines (+426/-201) (has conflicts) 24 files modified configure.ac (+5/-2) examples/client.cc (+6/-6) examples/server.cc (+0/-1) examples/sqlite_server.cc (+1/-0) libdrizzle/column.cc (+10/-11) libdrizzle/column.h (+1/-1) libdrizzle/column_server.h (+1/-1) libdrizzle/conn.cc (+23/-20) libdrizzle/conn.h (+5/-5) libdrizzle/conn_server.h (+4/-1) libdrizzle/constants.h (+16/-2) libdrizzle/drizzle.cc (+15/-16) libdrizzle/drizzle.h (+3/-3) libdrizzle/field.cc (+3/-3) libdrizzle/handshake.cc (+6/-6) libdrizzle/include.am (+38/-27) libdrizzle/query.cc (+32/-12) libdrizzle/query.h (+6/-4) libdrizzle/result.cc (+73/-48) libdrizzle/row.cc (+11/-13) libdrizzle/structs.h (+141/-16) support-files/include.am (+1/-1) support-files/libdrizzle-1.0.pc.in (+3/-2) unittests/libdrizzle_test.cc (+22/-0) Text conflict in libdrizzle/include.am
To merge this branch:	bzr merge lp://qastaging/~mordred/drizzle/libdrizzle-cxx
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Drizzle Developers		2011-01-06	Pending
Review via email: mp+45453@code.qastaging.launchpad.net

This is the result of me talking on IRC and/or actually reading mailing lists.

Revision history for this message

Brian Aker (brianaker) wrote on 2011-01-06:

This will break any application compiled against libdrizzle :(

We can really only do this if you don't modify the types.

2230. By Monty Taylor on 2011-03-11: Install libdrizzle into libdrizzle-1.0 dir.
2229. By Monty Taylor on 2011-03-09: Removed a merge artifact.
2228. By Andrew Hutchings on 2011-03-09: Add drizzle_safe_escape_string() function
2227. By Andrew Hutchings on 2011-03-09: Add struct constructors
Fix addrinfo flags not set correctly
2226. By Monty Taylor on 2011-03-09: Moving libdrizzle to c++.