lp:~brianaker/drizzle/libdrizzle-startup-issue

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle/7.1 at revision 2540

Drizzle Trunk: Pending requested 2012-04-17

Diff: 416 lines (+208/-33) (has conflicts)

12 files modified

Makefile.am (+1/-0)
configure.ac (+6/-20)
drizzled/drizzled.cc (+31/-7)
libdrizzle-1.0/drizzle_client.h (+1/-0)
libdrizzle-1.0/include.am (+1/-0)
libdrizzle-1.0/version.h.in (+41/-0)
libdrizzle/conn.cc (+91/-0)
libdrizzle/drizzle.cc (+1/-1)
m4/libdrizzle_version.m4 (+30/-0)
support-files/drizzle.pc.in (+1/-1)
support-files/libdrizzle-1.0.pc.in (+2/-2)
support-files/libdrizzle.pc.in (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2538. By Brian Aker on 2012-04-17

If you try to connect while Drizzle is starting up, the connection will bever happen.

2537. By Brian Aker on 2012-04-16

Fix pid-file issues.

2536. By Brian Aker on 2012-04-16

This fixes the pkg files.

2535. By Tangent.Org Continuous Integration on 2012-03-22

added:
  plugin/regex_policy/tests/r/cache_overflow.result
  plugin/regex_policy/tests/t/cache_overflow-master.opt
  plugin/regex_policy/tests/t/cache_overflow.test
modified:
  plugin/regex_policy/module.cc
  plugin/regex_policy/policy.h
pending merge tips: (use -v to see all merge revisions)
  Clint Byrum 2012-03-16 fixing build failure caused by merge w/ trunk

2534. By Tangent.Org Continuous Integration on 2012-03-21

modified:
  docs/columntypes.rst
  docs/ipv6_data_type.rst
  plugin/ipv6_function/plugin.ini
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-03-21 [merge] Merge docs

2533. By Tangent.Org Continuous Integration on 2012-03-20

modified:
  drizzled/drizzled.cc
pending merge tips: (use -v to see all merge revisions)
  Mohit 2012-03-20 Space between << and " and << modify.

2532. By Tangent.Org Continuous Integration on 2012-03-18

modified:
  drizzled/drizzled.cc
  drizzled/main.cc
  plugin/signal_handler/signal_handler.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-03-17 [merge] Merge of create pid bug fix.

2531. By Brian Aker on 2012-03-18

Merge in updated replication documentation.

2530. By Brian Aker on 2012-03-18

Merge Henrik's changes.

2529. By Brian Aker on 2012-03-18

Merge Authors.