lp:~linuxjedi/drizzle/drizzle-libdrizzle-ssl

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle at revision 2555

Drizzle Trunk: Pending requested 2012-05-14

Diff: 691 lines (+380/-53)

15 files modified

configure.ac (+1/-0)
libdrizzle-1.0/constants.h (+6/-0)
libdrizzle-1.0/drizzle.h (+10/-0)
libdrizzle-1.0/drizzle_client.h (+1/-0)
libdrizzle-1.0/handshake_client.h (+10/-0)
libdrizzle-1.0/include.am (+5/-1)
libdrizzle-1.0/return.h (+1/-0)
libdrizzle-1.0/ssl.h (+49/-0)
libdrizzle-1.0/structs.h (+4/-0)
libdrizzle/conn.cc (+35/-17)
libdrizzle/drizzle.cc (+14/-0)
libdrizzle/handshake.cc (+108/-35)
libdrizzle/ssl.cc (+83/-0)
libdrizzle/state.h (+1/-0)
m4/pandora_have_libssl.m4 (+52/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2554. By Andrew Hutchings on 2012-05-12

Add SSL client support to libdrizzle

To use:

drizzle_library_init(); /* initiates the SSL library */
drizzle_set_ssl(con, "client-key.pem", "client-cert.pem", "ca-cert.pem", NULL, NULL) /* set the SSL details */

The connection will then automatically use SSL.
It can currently be used to talk to MySQL servers in SSL mode. Including the
slight non-spec handshake change in 5.5.

2553. By Brian Aker on 2012-05-06

Update version inside of configure.ac

2552. By Brian Aker on 2012-05-06

Add additional dependency to unittests.

2551. By Drizzle Continuous Integration on 2012-05-05

modified:
  plugin/gearman_udf/function_map.cc
pending merge tips: (use -v to see all merge revisions)
  srivastavamohit91... 2012-05-01 update #include statement for gearman

2550. By Drizzle Continuous Integration on 2012-05-02

pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-05-02 [merge] pending merge tips: (use -v to see all merge revisions)

2549. By Drizzle Continuous Integration on 2012-04-25

modified:
  plugin/rabbitmq/rabbitmq_log.cc
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-04-24 modified:

2548. By Drizzle Continuous Integration on 2012-04-24

modified:
  drizzled/drizzled.cc
  drizzled/execute/scanner.l
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-04-21 [merge] modified:

2547. By Drizzle Continuous Integration on 2012-04-23

modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest

2546. By Drizzle Continuous Integration on 2012-04-21

modified:
  plugin/regex_policy/module.cc
  plugin/regex_policy/policy.h
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-04-08 Refactor

2545. By Drizzle Continuous Integration on 2012-04-21

added:
  tests/suite/regression/r/986455.result
  tests/suite/regression/t/986455.test
modified:
  .bzrignore
  drizzled/drizzled.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/schema.h
  drizzled/identifier/table.cc
  drizzled/identifier/table.h
  drizzled/table/instance/base.cc
  drizzled/util/backtrace.cc
  drizzled/util/backtrace.h
  libdrizzle-1.0/t/drizzle_con_st.c
  libdrizzle/conn.cc
  plugin/mysql_unix_socket_protocol/protocol.cc
  plugin/slave/queue_producer.cc
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-04-20 [merge] added: