Merge lp://staging/~brianaker/drizzle/libdrizzle-update into lp://staging/~drizzle-trunk/drizzle/development
Proposed by
Brian Aker
Status: | Merged |
---|---|
Approved by: | Brian Aker |
Approved revision: | 2453 |
Merged at revision: | 2453 |
Proposed branch: | lp://staging/~brianaker/drizzle/libdrizzle-update |
Merge into: | lp://staging/~drizzle-trunk/drizzle/development |
Diff against target: |
5157 lines (+1051/-1460) 116 files modified
.bzrignore (+3/-0) Makefile.am (+5/-3) client/client_priv.h (+1/-1) client/drizzle.cc (+1/-1) client/drizzledump.cc (+4/-3) client/drizzledump_drizzle.h (+1/-1) client/drizzletest.cc (+1/-1) client/include.am (+2/-2) configure.ac (+2/-11) examples/client.cc (+1/-1) examples/pipe_query.cc (+1/-1) examples/proxy.cc (+2/-2) examples/server.cc (+1/-1) examples/simple.cc (+1/-1) examples/simple_multi.cc (+1/-1) examples/sqlite_server.cc (+1/-1) libdrizzle-1.0/column.c (+1/-1) libdrizzle-1.0/column_client.h (+1/-5) libdrizzle-1.0/column_server.h (+2/-5) libdrizzle-1.0/command.c (+1/-1) libdrizzle-1.0/common.h (+8/-11) libdrizzle-1.0/conn.c (+7/-1) libdrizzle-1.0/conn.h (+2/-5) libdrizzle-1.0/conn_client.h (+2/-5) libdrizzle-1.0/conn_local.h (+2/-5) libdrizzle-1.0/conn_server.h (+2/-5) libdrizzle-1.0/conn_uds.c (+1/-1) libdrizzle-1.0/constants.h (+100/-37) libdrizzle-1.0/drizzle.c (+1/-1) libdrizzle-1.0/drizzle.h (+8/-12) libdrizzle-1.0/drizzle_client.h (+10/-13) libdrizzle-1.0/drizzle_local.h (+2/-5) libdrizzle-1.0/drizzle_server.h (+9/-12) libdrizzle-1.0/field.c (+1/-1) libdrizzle-1.0/field_client.h (+2/-5) libdrizzle-1.0/field_server.h (+1/-4) libdrizzle-1.0/handshake.c (+1/-1) libdrizzle-1.0/handshake_client.h (+2/-5) libdrizzle-1.0/handshake_server.h (+2/-5) libdrizzle-1.0/include.am (+62/-72) libdrizzle-1.0/pack.c (+1/-1) libdrizzle-1.0/pack.h (+2/-5) libdrizzle-1.0/query.c (+1/-1) libdrizzle-1.0/result.c (+183/-3) libdrizzle-1.0/result_client.h (+2/-5) libdrizzle-1.0/result_server.h (+2/-5) libdrizzle-1.0/row.c (+1/-1) libdrizzle-1.0/row_client.h (+2/-5) libdrizzle-1.0/row_server.h (+2/-5) libdrizzle-1.0/sha1.c (+1/-1) libdrizzle-1.0/sha1.h (+2/-5) libdrizzle-1.0/state.c (+3/-5) libdrizzle-1.0/state.h (+2/-5) libdrizzle-2.0/column.cc (+4/-4) libdrizzle-2.0/column.h (+1/-5) libdrizzle-2.0/column_client.h (+1/-4) libdrizzle-2.0/column_server.h (+2/-5) libdrizzle-2.0/command.cc (+1/-1) libdrizzle-2.0/command_client.h (+2/-5) libdrizzle-2.0/command_server.h (+1/-5) libdrizzle-2.0/common.h (+8/-11) libdrizzle-2.0/conn.cc (+11/-1) libdrizzle-2.0/conn.h (+2/-5) libdrizzle-2.0/conn_client.h (+2/-5) libdrizzle-2.0/conn_local.h (+2/-5) libdrizzle-2.0/conn_server.h (+2/-5) libdrizzle-2.0/conn_uds.cc (+1/-1) libdrizzle-2.0/constants.h (+100/-37) libdrizzle-2.0/drizzle.cc (+1/-1) libdrizzle-2.0/drizzle.h (+8/-12) libdrizzle-2.0/drizzle_client.h (+10/-14) libdrizzle-2.0/drizzle_local.h (+2/-5) libdrizzle-2.0/drizzle_server.h (+10/-13) libdrizzle-2.0/field.cc (+1/-1) libdrizzle-2.0/field_client.h (+2/-5) libdrizzle-2.0/field_server.h (+2/-5) libdrizzle-2.0/handshake.cc (+1/-1) libdrizzle-2.0/handshake_client.h (+2/-5) libdrizzle-2.0/handshake_server.h (+2/-5) libdrizzle-2.0/include.am (+99/-110) libdrizzle-2.0/libdrizzle.h (+1/-1) libdrizzle-2.0/libdrizzle.hpp (+1/-1) libdrizzle-2.0/mysql_password_hash.cc (+1/-1) libdrizzle-2.0/pack.cc (+1/-1) libdrizzle-2.0/pack.h (+2/-5) libdrizzle-2.0/query.cc (+1/-1) libdrizzle-2.0/query.h (+2/-5) libdrizzle-2.0/result.cc (+164/-1) libdrizzle-2.0/result.h (+2/-5) libdrizzle-2.0/result_client.h (+2/-5) libdrizzle-2.0/result_server.h (+2/-5) libdrizzle-2.0/row.cc (+1/-1) libdrizzle-2.0/row_client.h (+2/-5) libdrizzle-2.0/row_server.h (+2/-5) libdrizzle-2.0/sha1.cc (+1/-1) libdrizzle-2.0/sha1.h (+2/-5) libdrizzle-2.0/state.cc (+3/-5) libdrizzle-2.0/state.h (+2/-5) libdrizzle-2.0/structs.h (+2/-5) libdrizzle-2.0/visibility.h (+2/-5) libdrizzle/drizzle.h (+39/-0) libdrizzle/drizzle_client.h (+39/-0) libdrizzle/include.am (+4/-0) plugin/innobase/xtrabackup/Makefile (+0/-141) plugin/mysql_protocol/mysql_protocol.cc (+1/-1) plugin/slave/plugin.ini (+1/-1) plugin/transaction_log/plugin.am (+1/-1) support-files/drizzle7.pc.in (+2/-1) support-files/libdrizzle-1.0.pc.in (+3/-3) support-files/libdrizzle-2.0.pc.in (+3/-3) support-files/libdrizzle.pc.in (+11/-0) tests/randgen/Makefile (+0/-20) tests/sql-bench/Makefile.in (+0/-638) unittests/include.am (+5/-5) unittests/libdrizzle_test.cc (+2/-2) win32/include.am (+2/-4) |
To merge this branch: | bzr merge lp://staging/~brianaker/drizzle/libdrizzle-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Merge Team | Pending | ||
Review via email:
|
To post a comment you must log in.