lp:~brianaker/drizzle/libdrizzle-2.0-not-install

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development at revision 2465

Drizzle Merge Team: Pending requested 2011-11-29

Diff: 4957 lines (+1402/-1001)

39 files modified

client/drizzle.cc (+142/-117)
client/drizzledump_data.cc (+39/-27)
client/drizzledump_data.h (+12/-4)
client/drizzleimport.cc (+12/-3)
client/drizzleslap.cc (+41/-30)
drizzled/internal/m_string.h (+5/-5)
examples/client.cc (+54/-24)
examples/pipe_query.cc (+20/-20)
examples/proxy.cc (+85/-73)
examples/server.cc (+28/-25)
examples/simple_multi.cc (+44/-39)
examples/sqlite_server.cc (+123/-121)
libdrizzle-2.0/column.cc (+7/-3)
libdrizzle-2.0/command.h (+102/-0)
libdrizzle-2.0/conn.cc (+72/-16)
libdrizzle-2.0/constants.h (+9/-172)
libdrizzle-2.0/deprecated_enum.h (+67/-0)
libdrizzle-2.0/drizzle.cc (+79/-65)
libdrizzle-2.0/drizzle.h (+7/-45)
libdrizzle-2.0/drizzle_client.h (+2/-2)
libdrizzle-2.0/drizzle_server.h (+1/-5)
libdrizzle-2.0/handshake.cc (+7/-5)
libdrizzle-2.0/include.am (+40/-36)
libdrizzle-2.0/libdrizzle.hpp (+25/-12)
libdrizzle-2.0/limits.h (+56/-0)
libdrizzle-2.0/query.cc (+30/-48)
libdrizzle-2.0/query.h (+4/-7)
libdrizzle-2.0/result.cc (+31/-20)
libdrizzle-2.0/result.h (+6/-5)
libdrizzle-2.0/return.h (+78/-0)
libdrizzle-2.0/row.cc (+4/-0)
libdrizzle-2.0/structs.h (+28/-4)
libdrizzle-2.0/verbose.h (+58/-0)
plugin/mysql_protocol/mysql_protocol.cc (+10/-6)
plugin/slave/queue_producer.cc (+31/-29)
plugin/slave/queue_producer.h (+3/-2)
plugin/transaction_log/utilities/transaction_log_connection.cc (+36/-27)
plugin/transaction_log/utilities/transaction_log_connection.h (+2/-2)
support-files/include.am (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2469. By Brian Aker on 2011-11-29

Remove support for installing libdrizzle-2.0 until we get it stabalized

2468. By Brian Aker on 2011-11-27

Move result over to being behind API.

2467. By Brian Aker on 2011-11-26

Remove con from being passed object.

2466. By Brian Aker on 2011-11-24

Redo the way options are handled.

2465. By Brian Aker on 2011-11-24

First pass, drizzle_create() no longer takes an argument. This means that we can now change drizzle_st without being concerned about ABI.

2464. By Brian Aker on 2011-11-23

Break out options, first pass.

2463. By Mark Atwood on 2011-11-22

merge lp:~brianaker/drizzle/fedora-16-fixes

2462. By Mark Atwood on 2011-11-20

merge lp:~brianaker/drizzle/libdrizzle-refactor

2461. By Mark Atwood on 2011-11-15

merge lp:~stewart/drizzle/fix-gcc46-build

2460. By Mark Atwood on 2011-11-15

lp:~hingo/drizzle/7.1-docs-reviewfixes