lp:~brianaker/drizzle/951788

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle at revision 2556

Drizzle Trunk: Pending requested 2012-05-19

Diff: 75 lines (+21/-25)

1 file modified

client/server_detect.cc (+21/-25)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2556. By Brian Aker on 2012-05-19

Merge conflict fix.

2555. By Brian Aker on 2012-05-19

Merge of build tree (Andrew's SSL patch)

2554. By Brian Aker on 2012-05-14

Merge 7.1

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